Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
5d7f006ad9
|
|||
72104728ac
|
@@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
#}}}
|
#}}}
|
||||||
|
Reference in New Issue
Block a user