root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[util-iso-image] proper fix #326

Browse source
This commit is contained in:
Philip Müller 2020-11-20 11:59:27 +01:00
parent 5a28432745
commit 2f7fadaa70
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/util-iso-image.sh
View file

@ -264,7 +264,7 @@ configure_journald(){
disable_srv_live(){ disable_srv_live(){
for srv in ${disable_systemd_live[@]}; do for srv in ${disable_systemd_live[@]}; do
enable_systemd=(${enable_systemd[@]//*$srv*}) enable_systemd_live=(${enable_systemd_live[@]//*$srv*})
done done
} }
@ -272,13 +272,10 @@ configure_services(){
info "Configuring services" info "Configuring services"
use_apparmor="false" use_apparmor="false"
apparmor_boot_args="" apparmor_boot_args=""
enable_systemd_live="$enable_systemd_live $enable_systemd"
[[ ! -z $disable_systemd_live ]] && disable_srv_live [[ ! -z $disable_systemd_live ]] && disable_srv_live
for svc in ${enable_systemd[@]}; do
add_svc_sd "$1" "$svc"
[[ "$svc" == "apparmor" ]] && use_apparmor="true"
done
for svc in ${enable_systemd_live[@]}; do for svc in ${enable_systemd_live[@]}; do
add_svc_sd "$1" "$svc" add_svc_sd "$1" "$svc"
[[ "$svc" == "apparmor" ]] && use_apparmor="true" [[ "$svc" == "apparmor" ]] && use_apparmor="true"