diff --git a/bin/buildiso.in b/bin/buildiso.in index 8dab7c8..68dae2a 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -56,6 +56,8 @@ display_settings(){ msg2 "addgroups: ${addgroups}" msg2 "hostname: ${hostname}" msg2 "pacman_mirrors: ${mirrors_conf}" + msg2 "startservices_systemd: ${startservices_systemd[*]}" + msg2 "startservices_openrc: ${startservices_openrc[*]}" msg "ISOFILE:" msg2 "iso_file: ${iso_file}" diff --git a/conf/manjaro-tools.conf b/conf/manjaro-tools.conf index 304cd4c..a129894 100644 --- a/conf/manjaro-tools.conf +++ b/conf/manjaro-tools.conf @@ -85,7 +85,7 @@ # addgroups="video,audio,power,disk,storage,optical,network,lp,scanner" # unset defaults to given values, unused -# startservices_systemd=('cupsd' 'tlp-sleep' 'tlp' ) +# startservices_systemd=('cupsd' 'tlp-sleep' 'tlp') # unset defaults to given values, unused # startservices_openrc=('cupsd' 'fcron' 'metalog') diff --git a/lib/util.sh b/lib/util.sh index 66c5d9b..a3bb3f1 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -330,6 +330,18 @@ load_config(){ addgroups="video,audio,power,disk,storage,optical,network,lp,scanner" fi + if [[ -n ${startservices_systemd} ]];then + startservices_systemd=${startservices_systemd} + else + startservices_systemd=('cupsd' 'tlp-sleep' 'tlp') + fi + + if [[ -n ${startservices_openrc} ]];then + startservices_openrc=${startservices_openrc} + else + startservices_openrc=('cupsd' 'fcron' 'metalog') + fi + return 0 }