buildiso: add s6 service error handling

src/lib/iso/services.sh

@@ -10,6 +10,8 @@ add_svc_openrc(){
         if [[ -f $mnt/etc/init.d/$svc ]];then
             msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
             chroot "$mnt" rc-update add "$svc" "$rlvl" &>/dev/null
+        else
+            warning "Service %s not found. Skipping." "$svc"
         fi
     done
 }
@@ -23,6 +25,8 @@ add_user_svc_openrc(){
             chroot "$mnt" mkdir -p /home/"${LIVEUSER}/$rc"
             chroot "$mnt" ln -s /etc/user/init.d/"$svc" /home/"${LIVEUSER}/$rc/$svc"
             chroot "$mnt" chown -R "${LIVEUSER}:${LIVEUSER}" /home/"${LIVEUSER}"/.config/rc
+        else
+            warning "Service %s not found. Skipping." "$svc"
         fi
     done
 }
@@ -33,6 +37,8 @@ add_svc_runit(){
         if [[ -d $mnt/etc/runit/sv/$svc ]]; then
             msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
             chroot "$mnt" ln -s /etc/runit/sv/"$svc" /etc/runit/runsvdir/"$rlvl" &>/dev/null
+        else
+            warning "Service %s not found. Skipping." "$svc"
         fi
     done
 }
@@ -42,11 +48,15 @@ add_svc_s6(){
     dep="$mnt"/etc/s6/sv/"$display_manager"-srv/dependencies.d
     for svc in "${SERVICES[@]}"; do
         msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
-        chroot "$mnt" s6-service add "$rlvl" "$svc"
-        if [[ "$svc" == "$display_manager" ]]; then
-            if [[ -d "$dep" ]]; then
-                touch "$dep"/artix-live
+        if [[ -d "$mnt"/etc/s6/sv/"$svc" ]] || [[ -d "$mnt"/etc/s6/sv/"$svc"-srv ]]; then
+            chroot "$mnt" s6-service add "$rlvl" "$svc"
+            if [[ "$svc" == "$display_manager" ]]; then
+                if [[ -d "$dep" ]]; then
+                    touch "$dep"/artix-live
+                fi
             fi
+        else
+            warning "Service %s not found. Skipping." "$svc"
         fi
     done
 
@@ -63,9 +73,11 @@ add_svc_s6(){
 add_svc_dinit(){
     local mnt="$1"
     for svc in "${SERVICES[@]}"; do
-        if [[ -d $mnt/etc/dinit.d/boot.d ]]; then
+        if [[ -f "$mnt"/etc/dinit.d/"$svc" ]]; then
             msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
             chroot "$mnt" dinitctl enable -o "$svc" &>/dev/null
+        else
+            warning "Service %s not found. Skipping." "$svc"
         fi
     done
 }
@@ -79,6 +91,8 @@ add_user_svc_dinit(){
             chroot "$mnt" mkdir -p "$usr_sv"/boot.d
             chroot "$mnt" ln -s /etc/dinit.d/user/"$svc" "$usr_sv"/boot.d/"$svc"
             chroot "$mnt" chown -R "${LIVEUSER}:${LIVEUSER}" "$usr_sv"
+        else
+            warning "Service %s not found. Skipping." "$svc"
         fi
     done
 }