buildiso: write proper calameres services-66.conf

bin/base/fstabgen.in

@@ -364,23 +364,19 @@ while read -r src target fstype opts fsroot; do
         pass=0
     fi
 
-    if [[ $fsroot != / ]]; then
+    if [[ $fsroot != / && $fstype != btrfs ]]; then
-        if [[ $fstype = btrfs ]]; then
+        # it's a bind mount
-            opts+=,subvol=${fsroot#/}
+        src=$(findmnt -funcevo TARGET "$src")$fsroot
-        else
+        if [[ $src -ef $target ]]; then
-            # it's a bind mount
+            # hrmm, this is weird. we're probably looking at a file or directory
-            src=$(findmnt -funcevo TARGET "$src")$fsroot
+            # that was bound into a chroot from the host machine. Ignore it,
-            if [[ $src -ef $target ]]; then
+            # because this won't actually be a valid mount. Worst case, the user
-                # hrmm, this is weird. we're probably looking at a file or directory
+            # just re-adds it.
-                # that was bound into a chroot from the host machine. Ignore it,
+            continue
-                # because this won't actually be a valid mount. Worst case, the user
-                # just re-adds it.
-                continue
-            fi
-            fstype=none
-            opts+=,bind
-            pass=0
         fi
+        fstype=none
+        opts+=,bind
+        pass=0
     fi
 
     # filesystem quirks

data/conf/artools-pkg.conf

@@ -13,6 +13,7 @@
 #         packages-openrc
 #         packages-runit
 #         packages-s6
+#         packages-66
 #         packages-python
 #         packages-perl
 #         packages-java

lib/iso/calamares.sh

@@ -33,7 +33,7 @@ write_services_s6_conf(){
 
 write_services_66_conf(){
     local conf="$1"/services-66.conf
-    write_services_conf 'svDir' '/etc/66/service' 'dbDir' '/run/66/tree' > "$conf"
+    write_services_conf 'svDir' '/etc/66/service' 'runsvDir' '/var/lib/66/system' > "$conf"
 }
 
 write_postcfg(){

lib/iso/services.sh

@@ -47,9 +47,9 @@ add_svc_66(){
     local mnt="$1" names="$2"
     chroot "$mnt" 66-tree -cnE root &>/dev/null
     for svc in $names; do
-        if [[ -f $mnt/etc/66/service/$svc ]]; then
+        if [[ -f "$mnt"/etc/66/service/"$svc" ]]; then
-            chroot "$mnt" 66-enable -t root $svc &>/dev/null
+            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
-            chroot "$mnt" 66-start -t root $svc &>/dev/null
+            chroot "$mnt" 66-enable -t root "$svc" &>/dev/null
         fi
     done
 }

lib/util-pkg.sh

@@ -31,7 +31,7 @@ load_pkg_config(){
         python-{world,galaxy}
     )
 
-    local init_tree=(packages-{openrc,runit,s6})
+    local init_tree=(packages-{openrc,runit,s6,66})
 
     local desktop_tree=(
         packages-{kf5,plasma,kde,qt6}