Merge branch 'disable_systemd_live' into 'master'

add 'disable_systemd_live'

See merge request tools/development-tools/manjaro-tools!313
This commit is contained in:
Bernhard Landauer 2020-10-22 12:41:20 +02:00
commit 15406d86f4
4 changed files with 12 additions and 0 deletions

0
bin/buildiso.in Executable file → Normal file
View file

View file

@ -77,3 +77,5 @@
# names must match systemd service names
# services in enable_systemd array don't need to be listed here
# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
# disable_systemd_live=()

View file

@ -262,10 +262,19 @@ configure_journald(){
sed -i 's/#\(Storage=\)auto/\1volatile/' "$conf"
}
disable_srv_live(){
for srv in ${disable_systemd_live[@]}; do
enable_systemd=(${enable_systemd[@]//*$srv*})
done
}
configure_services(){
info "Configuring services"
use_apparmor="false"
apparmor_boot_args=""
[[ ! -z $disable_systemd_live ]] && disable_srv_live
for svc in ${enable_systemd[@]}; do
add_svc_sd "$1" "$svc"
[[ "$svc" == "apparmor" ]] && use_apparmor="true"

View file

@ -502,6 +502,7 @@ reset_profile(){
unset enable_systemd
unset disable_systemd
unset enable_systemd_live
unset disable_systemd_live
unset packages_desktop
unset packages_mhwd
unset login_shell