diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2017-11-16 14:57:45 -0500 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2019-10-19 13:44:56 -0400 |
commit | b6c677c4f1c129af9d66426d68db00cf03dc5651 (patch) | |
tree | a3592a72dc27b1c1f137d6e311cba18df3ab8e1f /configs/profile/airootfs/root | |
parent | fc7d4b4a0ca902a937ce96c2f78457345832f1c9 (diff) |
finalize package list schema
Diffstat (limited to 'configs/profile/airootfs/root')
-rwxr-xr-x | configs/profile/airootfs/root/customize_airootfs.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configs/profile/airootfs/root/customize_airootfs.sh b/configs/profile/airootfs/root/customize_airootfs.sh index 8210404..b361b90 100755 --- a/configs/profile/airootfs/root/customize_airootfs.sh +++ b/configs/profile/airootfs/root/customize_airootfs.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 @@ -85,7 +85,7 @@ then sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config # enable services systemctl set-default multi-user.target systemctl enable ${SYSTEMD_SERVICES_ALL} - [[ "${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 @@ -97,7 +97,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 @@ -113,7 +113,7 @@ chmod 700 /root # 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 @@ -130,14 +130,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 |