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

Revert "fix #326"

Browse source 
This reverts commit 1eb51d062f.
This commit is contained in:
Philip Müller 2020-11-20 11:55:29 +01:00
parent 1eb51d062f
commit 5a28432745
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -264,18 +264,18 @@ configure_journald(){
disable_srv_live(){ disable_srv_live(){
for srv in ${disable_systemd_live[@]}; do for srv in ${disable_systemd_live[@]}; do
enable_systemd_both=(${enable_systemd[@]//*$srv*}) enable_systemd=(${enable_systemd[@]//*$srv*})
done done
} }
configure_services_live(){ configure_services(){
info "Configuring services" info "Configuring services"
use_apparmor="false" use_apparmor="false"
apparmor_boot_args="" apparmor_boot_args=""
[[ ! -z $disable_systemd_live ]] && disable_srv_live [[ ! -z $disable_systemd_live ]] && disable_srv_live
for svc in ${enable_systemd_both[@]}; do for svc in ${enable_systemd[@]}; do
add_svc_sd "$1" "$svc" add_svc_sd "$1" "$svc"
[[ "$svc" == "apparmor" ]] && use_apparmor="true" [[ "$svc" == "apparmor" ]] && use_apparmor="true"
done done
@ -364,7 +364,7 @@ configure_live_image(){
msg "Configuring [livefs]" msg "Configuring [livefs]"
configure_hosts "$1" configure_hosts "$1"
configure_system "$1" configure_system "$1"
configure_services_live "$1" configure_services "$1"
configure_calamares "$1" configure_calamares "$1"
# [[ ${edition} == "sonar" ]] && configure_thus "$1" # [[ ${edition} == "sonar" ]] && configure_thus "$1"
write_live_session_conf "$1" write_live_session_conf "$1"