root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

buildiso: rename services vars to make it consistent

Browse source
This commit is contained in:
udeved 2016-08-04 09:59:47 +02:00
parent 89613eafa6
commit 660d27b92d
8 changed files with 42 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/buildiso.in
View file

@ -48,12 +48,12 @@ show_profile(){
msg2 "addgroups: %s" "${addgroups}"
if [[ ${initsys} == 'systemd' ]];then
msg2 "start_systemd: %s" "${start_systemd[*]}"
msg2 "start_systemd_live: %s" "${start_systemd_live[*]}"
msg2 "enable_systemd: %s" "${enable_systemd[*]}"
msg2 "enable_systemd_live: %s" "${enable_systemd_live[*]}"
msg2 "disable_systemd: %s" "${disable_systemd[*]}"
else
msg2 "start_openrc: %s" "${start_openrc[*]}"
msg2 "start_openrc_live: %s" "${start_openrc_live[*]}"
msg2 "enable_openrc: %s" "${enable_openrc[*]}"
msg2 "enable_openrc_live: %s" "${enable_openrc_live[*]}"
msg2 "disable_openrc: %s" "${disable_openrc[*]}"
fi
if ${torrent};then

14
data/profile.conf.example
View file

@ -51,11 +51,13 @@
# unset defaults to given values
# names must match systemd service names
# start_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')
# enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')
# disable_systemd=()
# unset defaults to given values,
# names must match openrc service names
# start_openrc=('acpid' 'bluetooth' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
# enable_openrc=('acpid' 'bluetooth' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
# disable_openrc=()
################# live-session #################
@ -76,10 +78,10 @@
# unset defaults to given values
# names must match systemd service names
# services in start_systemd array don't need to be listed here
# start_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init')
# services in enable_systemd array don't need to be listed here
# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
# unset defaults to given values,
# names must match openrc service names
# services in start_openrc array don't need to be listed here
# start_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init')
# services in enable_openrc array don't need to be listed here
# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')

4
docbook/manjaro-tools.conf.xml
View file

@ -266,8 +266,8 @@
<listitem><para>Takes <option>systemd</option> (the default)
or <option>openrc</option>. Selecting and option will change
how the hostname, the displaymanager and services will be configured.
For services also controls if buildiso will use start_systemd and
start_systemd_live or start_openrc and start_openrc_live to determine
For services also controls if buildiso will use enable_systemd and
enable_systemd_live or enable_openrc and enable_openrc_live to determine
the default services that will be enabled automatically.
</para></listitem>
</varlistentry>

8
docbook/profile.conf.xml
View file

@ -184,7 +184,7 @@
</varlistentry>
<varlistentry>
<term><varname>start_systemd=</varname></term>
<term><varname>enable_systemd=</varname></term>
<listitem><para>Array of services that will be
enabled in systemd systems. It has to match
@ -193,7 +193,7 @@
</varlistentry>
<varlistentry>
<term><varname>start_openrc=</varname></term>
<term><varname>enable_openrc=</varname></term>
<listitem><para>Array of services that will be
enabled in openrc systems.
@ -241,7 +241,7 @@
</varlistentry>
<varlistentry>
<term><varname>start_systemd_live=</varname></term>
<term><varname>enable_systemd_live=</varname></term>
<listitem><para>Array of services that will be
enabled in the systemd live-cd. It has to match
@ -250,7 +250,7 @@
</varlistentry>
<varlistentry>
<term><varname>start_openrc_live=</varname></term>
<term><varname>enable_openrc_live=</varname></term>
<listitem><para>Array of services that will be
enabled in the openrc live-cd.

20
lib/util-iso-calamares.sh
View file

@ -57,24 +57,20 @@ write_services_conf(){
echo '' >> "$conf"
if [[ ${initsys} == 'openrc' ]];then
echo 'services:' >> "$conf"
for s in ${start_openrc[@]};do
echo ' - name: '"$s" >> "$conf"
echo ' mandatory: false' >> "$conf"
echo '' >> "$conf"
for s in ${enable_openrc[@]};do
echo ' enabled:' >> "$conf"
echo ' - name: '"$s" >> "$conf"
echo ' runlevel: default' >> "$conf"
done
echo 'targets:' >> "$conf"
echo ' - name: "graphical"' >> "$conf"
echo ' mandatory: false' >> "$conf"
echo '' >> "$conf"
echo 'disable:' >> "$conf"
for s in ${disable_openrc[@]};do
echo ' - name: '"$s" >> "$conf"
echo ' mandatory: false' >> "$conf"
echo ' disabled:' >> "$conf"
echo ' - name: '"$s" >> "$conf"
echo ' runlevel: boot' >> "$conf"
echo '' >> "$conf"
done
else
echo 'services:' > "$conf"
for s in ${start_systemd[@]};do
for s in ${enable_systemd[@]};do
echo ' - name: '"$s" >> "$conf"
echo ' mandatory: false' >> "$conf"
echo '' >> "$conf"

8
lib/util-iso-image.sh
View file

@ -323,7 +323,7 @@ configure_services(){
info "Configuring [%s]" "${initsys}"
case ${initsys} in
'openrc')
for svc in ${start_openrc[@]}; do
for svc in ${enable_openrc[@]}; do
add_svc_rc "$1" "$svc"
done
if [[ ${displaymanager} != "none" ]];then
@ -332,7 +332,7 @@ configure_services(){
fi
;;
'systemd')
for svc in ${start_systemd[@]}; do
for svc in ${enable_systemd[@]}; do
add_svc_sd "$1" "$svc"
done
if [[ ${displaymanager} != "none" ]];then
@ -347,12 +347,12 @@ configure_services_live(){
info "Configuring [%s]" "${initsys}"
case ${initsys} in
'openrc')
for svc in ${start_openrc_live[@]}; do
for svc in ${enable_openrc_live[@]}; do
add_svc_rc "$1" "$svc"
done
;;
'systemd')
for svc in ${start_systemd_live[@]}; do
for svc in ${enable_systemd_live[@]}; do
add_svc_sd "$1" "$svc"
done
;;

8
lib/util-iso.sh
View file

@ -664,12 +664,12 @@ reset_profile(){
unset plymouth_theme
unset password
unset addgroups
unset start_systemd
unset enable_systemd
unset disable_systemd
unset start_openrc
unset enable_openrc
unset disable_openrc
unset start_systemd_live
unset start_openrc_live
unset enable_systemd_live
unset enable_openrc_live
unset packages_custom
unset packages_mhwd
unset login_shell

16
lib/util.sh
View file

@ -413,24 +413,24 @@ load_profile_config(){
addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel"
fi
if [[ -z ${start_systemd[@]} ]];then
start_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')
if [[ -z ${enable_systemd[@]} ]];then
enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')
fi
[[ -z ${disable_systemd[@]} ]] && disable_systemd=('pacman-init')
if [[ -z ${start_openrc[@]} ]];then
start_openrc=('acpid' 'bluetooth' 'cgmanager' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
if [[ -z ${enable_openrc[@]} ]];then
enable_openrc=('acpid' 'bluetooth' 'cgmanager' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
fi
[[ -z ${disable_openrc[@]} ]] && disable_openrc=('pacman-init')
if [[ -z ${start_systemd_live[@]} ]];then
start_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init')
if [[ -z ${enable_systemd_live[@]} ]];then
enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init')
fi
if [[ -z ${start_openrc_live[@]} ]];then
start_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init')
if [[ -z ${enable_openrc_live[@]} ]];then
enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init')
fi
[[ -z ${tracker_url} ]] && tracker_url='udp://mirror.strits.dk:6969'