root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

load system serives array for livecd configuration

Browse source
This commit is contained in:
udeved 2014-12-11 14:21:49 +01:00
parent 35ef69b778
commit c6105c19e7
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/buildiso.in
View file

@ -56,6 +56,8 @@ display_settings(){
msg2 "addgroups: ${addgroups}" msg2 "addgroups: ${addgroups}"
msg2 "hostname: ${hostname}" msg2 "hostname: ${hostname}"
msg2 "pacman_mirrors: ${mirrors_conf}" msg2 "pacman_mirrors: ${mirrors_conf}"
msg2 "startservices_systemd: ${startservices_systemd[*]}"
msg2 "startservices_openrc: ${startservices_openrc[*]}"
msg "ISOFILE:" msg "ISOFILE:"
msg2 "iso_file: ${iso_file}" msg2 "iso_file: ${iso_file}"

2
conf/manjaro-tools.conf
View file

@ -85,7 +85,7 @@
# addgroups="video,audio,power,disk,storage,optical,network,lp,scanner" # addgroups="video,audio,power,disk,storage,optical,network,lp,scanner"
# unset defaults to given values, unused # unset defaults to given values, unused
# startservices_systemd=('cupsd' 'tlp-sleep' 'tlp' ) # startservices_systemd=('cupsd' 'tlp-sleep' 'tlp')
# unset defaults to given values, unused # unset defaults to given values, unused
# startservices_openrc=('cupsd' 'fcron' 'metalog') # startservices_openrc=('cupsd' 'fcron' 'metalog')

12
lib/util.sh
View file

@ -330,6 +330,18 @@ load_config(){
addgroups="video,audio,power,disk,storage,optical,network,lp,scanner" addgroups="video,audio,power,disk,storage,optical,network,lp,scanner"
fi 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 return 0
} }