Merge pull request 's6: use database names instead of directory names' (#27) from Dudemanguy/artools:master into master

It's possible for a service in s6 to exist but for its name to not
actually be the same as the name of an existing directory (ex: a
pipeline of a logger and service daemon). Instead, rework this function
to detect if a service exists based on whether it is defined in the
s6-rc database.

bin/pkg/buildtree.in

@@ -151,6 +151,7 @@ get_group(){
     eval "case $pkg in
         $(get_group_packages kernel)) tree=packages-kernel ;;
         $(get_group_packages net)) tree=packages-net ;;
+        $(get_group_packages gfx)) tree=packages-gfx ;;
         $(get_group_packages python)) tree=packages-python ;;
         $(get_group_packages perl)) tree=packages-perl ;;
         $(get_group_packages ruby)) tree=packages-ruby ;;

data/conf/artools-pkg.conf

@@ -15,6 +15,7 @@
 #         community
 #         packages-kernel
 #         packages-net
+#         packages-gfx
 #         packages-openrc
 #         packages-runit
 #         packages-s6

lib/iso/chrootcfg.sh

@@ -36,7 +36,9 @@ add_svc_runit(){
 add_svc_s6(){
     local mnt="$1" names="$2" valid="" rlvl="${3:-default}"
     for svc in $names; do
-        if [[ -d $mnt/etc/s6/sv/$svc ]]; then
+        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}
         fi

lib/util-pkg.sh.in

@@ -42,6 +42,7 @@ load_pkg_config(){
             community
             packages-kernel
             packages-net
+            packages-gfx
             packages-openrc
             packages-runit
             packages-s6