buildiso: create calamares conf default symlink

src/lib/iso/calamares.sh

@@ -8,25 +8,30 @@ yaml_array() {
     local array yaml
 
     for entry in "$@"; do
-        yaml="{name: ${entry}, action: enable, alias: add, target: default}"
+        yaml="{name: ${entry}, action: enable}"
         array="${array:-}${array:+,} ${yaml}"
     done
     printf "%s\n" "[${array}]"
 }
 
 configure_calamares(){
-    local mods="$1/etc/calamares/modules"
+    for config in online offline; do
-    if [[ -d "$mods" ]];then
+        local mods="$1/etc/calamares-$config/modules"
-        msg2 "Configuring: Calamares"
+        if [[ -d "$mods" ]];then
+            msg2 "Configuring: Calamares %s" "$config"
 
-        if [[ -f "$mods"/services-artix.conf ]]; then
+            if [[ -f "$mods"/services-artix.conf ]]; then
-            local svc init
+                local svc
-            init="${INITSYS}" svc=$(yaml_array "${SERVICES[@]}") \
+                svc=$(yaml_array "${SERVICES[@]}") \
-                yq -P 'with(.;
+                    yq -P 'with(.;
-                        .manager = env(init) |
+                            .command = "artix-service" |
-                        .services = env(svc) )' \
+                            .services = env(svc) )' \
-                    -i "$mods"/services-artix.conf
+                        -i "$mods"/services-artix.conf
+            fi
         fi
+    done
+    if [[ -d "$1"/etc/calamares-offline ]]; then
+        ln -sf calamares-offline "$1"/etc/calamares
     fi
 }
 

src/lib/iso/firmware.sh

@@ -13,7 +13,6 @@ prepare_boot_extras(){
     done
 
     cp "$src"/boot/memtest86+/memtest.bin "$dest"/memtest
-    cp "$src"/usr/share/licenses/common/GPL2/license.txt "$dest"/memtest.COPYING
 }
 
 #}}}