Merge pull request 's6: use s6-rc-bundle-update to add services' (#40 ) from Dudemanguy/artools:master into master

Reviewed-on: #40
s6: use s6-rc-bundle-update to add services
2020-11-29 19:31:46 +01:00 · 2020-11-29 12:15:31 -06:00
1 changed files with 2 additions and 3 deletions
--- a/lib/iso/chrootcfg.sh
+++ b/lib/iso/chrootcfg.sh
@@ -34,16 +34,15 @@ add_svc_runit(){
 }

 add_svc_s6(){
-    local mnt="$1" names="$2" valid="" rlvl="${3:-default}"
+    local mnt="$1" names="$2" rlvl="${3:-default}"
    for svc in $names; do
        error=false
        chroot $mnt s6-rc-db -c /etc/s6/rc/compiled type $svc &> /dev/null || error=true
        if [ $? == 0 ] && [[ $error == false ]]; then
            msg2 "Setting %s ..." "$svc"
-            valid=${valid:-}${valid:+' '}${svc}
+            chroot $mnt s6-rc-bundle-update -c /etc/s6/rc/compiled add $rlvl $svc
        fi
    done
-    chroot $mnt s6-rc-bundle -c /etc/s6/rc/compiled add $rlvl $valid

    # rebuild s6-linux-init binaries
    chroot $mnt rm -r /etc/s6/current