From 1eb51d062fda64c14596d9294cd9fc131c750236 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Thu, 12 Nov 2020 22:34:01 +0100 Subject: [PATCH] fix https://gitlab.manjaro.org/tools/development-tools/manjaro-tools/-/issues/326 --- lib/util-iso-image.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh index d7b78a3..7a4ec29 100644 --- a/lib/util-iso-image.sh +++ b/lib/util-iso-image.sh @@ -264,18 +264,18 @@ configure_journald(){ disable_srv_live(){ for srv in ${disable_systemd_live[@]}; do - enable_systemd=(${enable_systemd[@]//*$srv*}) + enable_systemd_both=(${enable_systemd[@]//*$srv*}) done } -configure_services(){ +configure_services_live(){ info "Configuring services" use_apparmor="false" apparmor_boot_args="" [[ ! -z $disable_systemd_live ]] && disable_srv_live - for svc in ${enable_systemd[@]}; do + for svc in ${enable_systemd_both[@]}; do add_svc_sd "$1" "$svc" [[ "$svc" == "apparmor" ]] && use_apparmor="true" done @@ -364,7 +364,7 @@ configure_live_image(){ msg "Configuring [livefs]" configure_hosts "$1" configure_system "$1" - configure_services "$1" + configure_services_live "$1" configure_calamares "$1" # [[ ${edition} == "sonar" ]] && configure_thus "$1" write_live_session_conf "$1"