Merge branch 'devel' of github.com:artix-linux/artools

Add initial runit support

data/base/Packages-Live

@@ -1,6 +1,7 @@
 mkinitcpio-nfs-utils
 nbd
 >openrc artix-live-openrc
+>runit artix-live-runit
 squashfs-tools
 artix-live-portable-efi
 linux-lts-headers

data/base/Packages-Root

@@ -60,6 +60,19 @@ ntfs-3g
 >openrc rsync-openrc
 >openrc wpa_supplicant-openrc
 >openrc opentmpfiles
+>runit runit-artix
+>runit acpid-runit
+>runit cronie-runit
+>runit dbus-runit
+>runit dhcpcd-runit
+>runit elogind-runit
+>runit haveged-runit
+>runit lvm2-runit
+>runit mdadm-runit
+>runit nfs-utils-runit
+>runit rsync-runit
+>runit wpa_supplicant-runit
+>runit opentmpfiles
 os-prober
 pacman
 pciutils

lib/util-iso-profile.sh

@@ -44,14 +44,19 @@ load_profile(){
     [[ -z ${password} ]] && password="artix"
 
     if [[ -z ${addgroups} ]];then
-        addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,audio"
+        addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,audio,log"
     fi
 
     if [[ -z ${services[@]} ]];then
         services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
     fi
 
-    [[ ${displaymanager} != "none" ]] && services+=('xdm')
+    if [[ ${displaymanager} != "none" ]];then
+        case "${initsys}" in
+            'openrc') services+=('xdm') ;;
+            'runit') services+=("${displaymanager}") ;;
+        esac
+    fi
 
     if [[ -z ${services_live[@]} ]];then
         services_live=('artix-live' 'pacman-init')

lib/util-iso-yaml.sh

@@ -27,14 +27,15 @@ write_bootloader_conf(){
 }
 
 write_servicescfg_conf(){
-    local conf="$1/servicescfg.conf"
+    local conf="$1/servicescfg.conf" init="$2"
     msg2 "Writing %s ..." "${conf##*/}"
     echo '---' >  "$conf"
+    echo "initsys: $init" >> "$conf"
     echo '' >> "$conf"
     echo 'services:' >> "$conf"
     echo '    enabled:' >> "$conf"
-    for s in ${services[@]};do
-        echo "      - name: $s" >> "$conf"
+    for svc in ${services[@]};do
+        echo "      - name: $svc" >> "$conf"
         echo '        runlevel: default' >> "$conf"
     done
 }
@@ -88,16 +89,14 @@ write_unpack_conf(){
 }
 
 configure_calamares(){
-    local dest="$1" mods="$1/etc/calamares/modules"
+    local dest="$1" mods="$1/etc/calamares/modules" init="$2"
     if [[ -d $dest/etc/calamares/modules ]];then
         info "Configuring [Calamares]"
         write_netinstall_conf "$mods"
         write_unpack_conf "$mods"
         write_users_conf "$mods"
         write_initcpio_conf "$mods"
-        case ${initsys} in
-            'openrc') write_servicescfg_conf "$mods" ;;
-        esac
+        write_servicescfg_conf "$mods" "$init"
         write_bootloader_conf "$mods"
         info "Done configuring [Calamares]"
     fi

lib/util-iso.sh

@@ -139,6 +139,14 @@ add_svc_rc(){
     fi
 }
 
+add_svc_runit(){
+    local mnt="$1" name="$2"
+    if [[ -d $mnt/etc/runit/sv/$name ]]; then
+        msg2 "Setting %s ..." "$name"
+        chroot $mnt ln -s /etc/runit/sv/$name /etc/runit/runsvdir/default &>/dev/null
+    fi
+}
+
 set_xdm(){
     if [[ -f $1/etc/conf.d/xdm ]];then
         local conf='DISPLAYMANAGER="'${displaymanager}'"'
@@ -173,6 +181,14 @@ configure_services(){
                 add_svc_rc "$mnt" "$svc" "default"
             done
         ;;
+        'runit')
+            for svc in ${services[@]}; do
+                add_svc_runit "$mnt" "$svc"
+            done
+            for svc in ${services_live[@]}; do
+                add_svc_runit "$mnt" "$svc"
+            done
+        ;;
     esac
     info "Done configuring [%s]" "${initsys}"
 }
@@ -180,7 +196,7 @@ configure_services(){
 configure_system(){
     local mnt="$1"
     case ${initsys} in
-        'openrc')
+        'openrc' | 'runit')
             configure_logind "$mnt" "elogind"
         ;;
     esac
@@ -242,7 +258,7 @@ configure_live_image(){
     configure_hosts "$fs"
     configure_system "$fs"
     configure_services "$fs"
-    configure_calamares "$fs"
+    configure_calamares "$fs" "${initsys}"
     write_live_session_conf "$fs"
     msg "Done configuring [livefs]"
 }
@@ -388,6 +404,7 @@ gen_iso_fn(){
     local vars=() name
     vars+=("${iso_name}")
     vars+=("${profile}")
+    [[ ${initsys} == 'runit' ]] && vars+=("${initsys}")
     vars+=("${iso_version}")
     vars+=("${target_arch}")
     for n in ${vars[@]};do