Compare commits

..

2 Commits

Author SHA1 Message Date
5d7f006ad9 buildiso: create calamares conf default symlink
All checks were successful
Artools shellcheck / lint (push) Successful in 31s
2024-02-13 20:49:16 +01:00
72104728ac buildiso: update calamares services-artix conf setting
All checks were successful
Artools shellcheck / lint (push) Successful in 24s
2024-02-04 23:55:45 +01:00

View File

@@ -8,7 +8,7 @@ yaml_array() {
local array yaml local array yaml
for entry in "$@"; do for entry in "$@"; do
yaml="{name: ${entry}, action: enable, alias: add, target: default}" yaml="{name: ${entry}, action: enable}"
array="${array:-}${array:+,} ${yaml}" array="${array:-}${array:+,} ${yaml}"
done done
printf "%s\n" "[${array}]" printf "%s\n" "[${array}]"
@@ -21,15 +21,18 @@ configure_calamares(){
msg2 "Configuring: Calamares %s" "$config" 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
fi fi
done done
if [[ -d "$1"/etc/calamares-offline ]]; then
ln -sf calamares-offline "$1"/etc/calamares
fi
} }
#}}} #}}}