diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2018-05-03 16:06:59 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2018-07-02 10:50:36 -0400 |
| commit | aba3ee6528d73fcf8c3ca8210d117f3b9367616f (patch) | |
| tree | 3cc4a2ffd37641b349afe95ea2873eb806bce22e /configs/profile/root-image | |
| parent | 139fb6038f7c00fd1c2d9284d24e2a1ef36a64a4 (diff) | |
squashme - houskeeping
Diffstat (limited to 'configs/profile/root-image')
| -rw-r--r-- | configs/profile/root-image/root/customize_root_image-constants.inc | 8 | ||||
| -rwxr-xr-x | configs/profile/root-image/root/customize_root_image.sh | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/configs/profile/root-image/root/customize_root_image-constants.inc b/configs/profile/root-image/root/customize_root_image-constants.inc index e55744a..d0359a6 100644 --- a/configs/profile/root-image/root/customize_root_image-constants.inc +++ b/configs/profile/root-image/root/customize_root_image-constants.inc @@ -30,6 +30,8 @@ readonly OPENRC_SERVICES_GUI="alsasound \ readonly OPENRC_SERVICES="${OPENRC_SERVICES_ALL} ${OPENRC_SERVICES_GUI}" [[ "${iso_gui}" == 'cli' ]] && readonly SYSTEMD_SERVICES="${SYSTEMD_SERVICES_ALL}" || readonly SYSTEMD_SERVICES="${SYSTEMD_SERVICES_ALL} ${SYSTEMD_SERVICES_GUI}" +[ "${enable_offline_install}" == 'true' ] && readonly INSTALL_TYPE='Complete' || \ + readonly INSTALL_TYPE='NetInstall' readonly DEFAULT_SHELL=/bin/bash readonly NETINSTALL_MSG="To install Parabola, the system must be connected to the internet." readonly COMPLETE_MSG="This ISO is capable of installing a complete Parabola system\n\ @@ -37,8 +39,8 @@ readonly COMPLETE_MSG="This ISO is capable of installing a complete Parabola sys >>>>the latest packages from the internet, run the following command\n\ >>>>before beginning the install:\n\ # cp /etc/pacman-online.conf /etc/pacman.conf" -[ "${enable_offline_install}" == 'false' ] && readonly NETWORK_MOTD_MSG=${NETINSTALL_MSG} || \ - readonly NETWORK_MOTD_MSG=${COMPLETE_MSG} +[ "${INSTALL_TYPE}" == 'Complete' ] && readonly NETWORK_MOTD_MSG=${NETINSTALL_MSG} || \ + readonly NETWORK_MOTD_MSG=${COMPLETE_MSG} readonly ROOT_SKEL_FILES="/etc/skel/.bash_logout \ /etc/skel/.bash_profile \ /etc/skel/install-openrc-lxde.sh \ @@ -48,6 +50,4 @@ readonly LIVE_USER_GROUPS="adm,audio,floppy,log,network,rfkill,scanner,storage,o readonly OPENRC_USER_GROUPS="disk,sys" [[ "${iso_init}" == 'openrc' ]] && readonly USER_GROUPS="${LIVE_USER_GROUPS},${OPENRC_USER_GROUPS}" || readonly USER_GROUPS="${LIVE_USER_GROUPS}" -[ "${enable_offline_install}" == 'true' ] && readonly INSTALL_TYPE="Complete" || \ - readonly INSTALL_TYPE="NetInstall" readonly PRETTY_NAME="$(echo ${iso_title} | cut -d ' ' -f -5) - (${INSTALL_TYPE})" diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh index 04990ac..163cde4 100755 --- a/configs/profile/root-image/root/customize_root_image.sh +++ b/configs/profile/root-image/root/customize_root_image.sh @@ -17,6 +17,8 @@ chmod 440 /etc/sudoers.d/g_wheel # configure pacman sed -i "s|#Server|Server|" /etc/pacman.d/mirrorlist +[ "${INSTALL_TYPE}" == 'Complete' ] && pacman_conf=pacman-offline.conf || pacman_conf=pacman-online.conf +cp /etc/${pacman_conf} /etc/pacman.conf # KLUDGE begin # FIXME: https://labs.parabola.nu/issues/1527 # if [[ "${arch}" == "i686" ]] # then echo "Server = https://repo.parabola.nu/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist |