forked from mirrored-repos/manjaro-tools
add disable_systemd_live; https://gitlab.manjaro.org/tools/development-tools/manjaro-tools/-/issues/326
This commit is contained in:
parent
204ae9004f
commit
3ae4799ee6
4 changed files with 12 additions and 0 deletions
0
bin/buildiso.in
Executable file → Normal file
0
bin/buildiso.in
Executable file → Normal file
|
@ -77,3 +77,5 @@
|
||||||
# names must match systemd service names
|
# names must match systemd service names
|
||||||
# services in enable_systemd array don't need to be listed here
|
# services in enable_systemd array don't need to be listed here
|
||||||
# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
|
# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
|
||||||
|
|
||||||
|
# disable_systemd_live=()
|
||||||
|
|
|
@ -262,10 +262,19 @@ configure_journald(){
|
||||||
sed -i 's/#\(Storage=\)auto/\1volatile/' "$conf"
|
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(){
|
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
|
||||||
|
|
||||||
for svc in ${enable_systemd[@]}; 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"
|
||||||
|
|
|
@ -502,6 +502,7 @@ reset_profile(){
|
||||||
unset enable_systemd
|
unset enable_systemd
|
||||||
unset disable_systemd
|
unset disable_systemd
|
||||||
unset enable_systemd_live
|
unset enable_systemd_live
|
||||||
|
unset disable_systemd_live
|
||||||
unset packages_desktop
|
unset packages_desktop
|
||||||
unset packages_mhwd
|
unset packages_mhwd
|
||||||
unset login_shell
|
unset login_shell
|
||||||
|
|
Loading…
Reference in a new issue