summaryrefslogtreecommitdiff
path: root/configs/profile/root-image
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2017-11-16 14:57:45 -0500
committerbill-auger <mr.j.spam.me@gmail.com>2020-03-27 18:05:48 -0400
commitf3695f93d991c12b0ecdf0afe8129ea7b08d8e29 (patch)
tree531746c48a88317d182b2f7f5edba02df7acdf6a /configs/profile/root-image
parent9aa612ba7a98b70b26edb16dbcd549b5bcde3fcd (diff)
finalize package list schema
Diffstat (limited to 'configs/profile/root-image')
-rwxr-xr-xconfigs/profile/root-image/root/customize_root_image.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index 505bf3d..c602220 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -31,7 +31,7 @@ readonly OPENRC_USER_GROUPS="disk,sys"
readonly USER_GROUPS="${LIVE_USER_GROUPS}"
[ "${enable_offline_install}" == 'true' ] && readonly INSTALL_TYPE="Complete" || \
readonly INSTALL_TYPE="NetInstall"
-readonly WELCOME_TITLE="Parabola ${iso_init}/${iso_wm} Edition - (${INSTALL_TYPE})"
+readonly WELCOME_TITLE="Parabola ${iso_init}/${iso_gui} Edition - (${INSTALL_TYPE})"
set -e -u
@@ -78,7 +78,7 @@ then systemctl enable ${SYSTEMD_SERVICES_ALL}
rm /etc/X11/Xwrapper.config
# enable services
- [[ "${iso_wm}" != 'cli' ]] && systemctl enable ${SYSTEMD_SERVICES_GUI}
+ [[ "${iso_gui}" != 'cli' ]] && systemctl enable ${SYSTEMD_SERVICES_GUI}
elif [[ "${iso_init}" == 'openrc' ]]
# delete files that are specific to other init systems
rm /etc/hostname
@@ -90,7 +90,7 @@ elif [[ "${iso_init}" == 'openrc' ]]
# enable services
for service in ${OPENRC_SERVICES_ALL} ; do rc-update add ${service} default ; done ;
- if [[ "${iso_wm}" != 'cli' ]]
+ if [[ "${iso_gui}" != 'cli' ]]
then for service in ${OPENRC_SERVICES_GUI} ; do rc-update add ${service} default ; done ;
fi
@@ -105,7 +105,7 @@ usermod -s ${DEFAULT_SHELL} root 2> /dev/null
# configure CLI login session
sed -i "s|_EDITION_TITLE_|${iso_title}|" /etc/motd
sed -i "s|_NETWORK_MOTD_MSG_|${NETWORK_MOTD_MSG}| ; s|^>>>>\(.*\)| \1|g" /etc/motd
-if [[ "${iso_wm}" == 'cli' ]]
+if [[ "${iso_gui}" == 'cli' ]]
then cp ${ROOT_SKEL_FILES} /root/
sed -i "s|_DESKTOP_SESSION_||" /root/.bash_profile
@@ -122,14 +122,14 @@ else # configure GUI login session and live user
sed -i "s|--question|--info|" /home/${LIVE_USER}/.config/autostart/autostart.sh
sed -i "s|--cancel-label=.*|\&|" /home/${LIVE_USER}/.config/autostart/autostart.sh
- if [[ "${iso_wm}" == 'lxde' ]]
+ if [[ "${iso_gui}" == 'lxde' ]]
then rm -f /etc/xdg/autostart/octopi-notifier.desktop 2> /dev/null
sed -i "s|_DESKTOP_SESSION_|LXDE|" /home/${LIVE_USER}/.bash_profile
sed -i "s|_DESKTOP_SESSION_|LXDE|" /home/${LIVE_USER}/.dmrc
- elif [[ "${iso_wm}" == 'mate' ]]
+ elif [[ "${iso_gui}" == 'mate' ]]
then sed -i "s|_DESKTOP_SESSION_|mate|" /home/${LIVE_USER}/.bash_profile
sed -i "s|_DESKTOP_SESSION_|mate|" /home/${LIVE_USER}/.dmrc
- else echo "invalid \$iso_wm for _DESKTOP_SESSION_ '${iso_wm}'"
+ else echo "invalid \$iso_gui for _DESKTOP_SESSION_ '${iso_gui}'"
exit 1
fi