diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2017-12-21 18:48:47 -0500 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2019-10-19 13:59:26 -0400 |
| commit | 46df1dd6a2902fb9a4309c771f29b9b7e462e755 (patch) | |
| tree | 5336c43f50eb878663c09367be3fb496ae5cdd50 /configs/profile/airootfs/root | |
| parent | 61026483d34cf7d3874e11f66abac19b9a416052 (diff) | |
squashme skel
Diffstat (limited to 'configs/profile/airootfs/root')
| -rwxr-xr-x | configs/profile/airootfs/root/customize_airootfs.sh | 16 | ||||
| -rw-r--r-- | configs/profile/airootfs/root/customize_root_image-constants.inc | 2 |
2 files changed, 12 insertions, 6 deletions
diff --git a/configs/profile/airootfs/root/customize_airootfs.sh b/configs/profile/airootfs/root/customize_airootfs.sh index 9051ce7..2826514 100755 --- a/configs/profile/airootfs/root/customize_airootfs.sh +++ b/configs/profile/airootfs/root/customize_airootfs.sh @@ -17,12 +17,15 @@ chmod 440 /etc/sudoers.d/g_wheel # configure pacman sed -i "s|#Server|Server|" /etc/pacman.d/mirrorlist - -# KLUDGE begin # TODO: https://labs.parabola.nu/issues/1527 +# KLUDGE begin # FIXME: https://labs.parabola.nu/issues/1527 if [[ "${arch}" == "i686" ]] -then echo "Server = https://repomirror.parabola.nu/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist +then echo "Server = https://repo.parabola.nu/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist fi # KLUDGE end +# KLUDGE begin temp until next calamares rebuild # FIXME: +cp /etc/pacman.conf /etc/pacman-offline.conf ; cp /etc/pacman.conf /etc/pacman-online.conf +sed -i 's|requiredStorage:.*|requiredStorage: 8.9|' /usr/share/calamares/modules/welcome.conf +# KLUDGE end # configure services if [[ "${iso_init}" == 'systemd' ]] @@ -59,8 +62,8 @@ chmod 700 /root sed -i "s|_EDITION_TITLE_|${iso_title}|" /etc/motd sed -i "s|_NETWORK_MOTD_MSG_|${NETWORK_MOTD_MSG}| ; s|^>>>>\(.*\)| \1|g" /etc/motd sed -i "s|PRETTY_NAME=.*|PRETTY_NAME=\"${PRETTY_NAME}\"|" /usr/lib/os-release -echo "VERSION=\"$( echo ${iso_title} | cut -d ' ' -f 6)\"" >> /usr/lib/os-release -echo "VERSION_ID=\"$(echo ${iso_title} | cut -d ' ' -f 6)\"" >> /usr/lib/os-release +echo "VERSION=\"$( echo ${iso_title} | cut -d ' ' -f 6 )\"" >> /usr/lib/os-release +echo "VERSION_ID=\"$(echo ${iso_title} | cut -d ' ' -f 6 )\"" >> /usr/lib/os-release echo "VARIANT=\"$( echo ${PRETTY_NAME} | cut -d ' ' -f -3 --complement)\"" >> /usr/lib/os-release echo "VARIANT_ID=\"${iso_init}-${iso_gui}\"" >> /usr/lib/os-release @@ -88,6 +91,9 @@ else # configure GUI login session and live user 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 + touch /home/${LIVE_USER}/Desktop/parabola-installer.desktop ; sleep 2 ; # sort + touch /home/${LIVE_USER}/Desktop/parabola-irc.desktop ; sleep 2 ; # sort + touch /home/${LIVE_USER}/Desktop/bug-tracker.desktop # sort 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 diff --git a/configs/profile/airootfs/root/customize_root_image-constants.inc b/configs/profile/airootfs/root/customize_root_image-constants.inc index a183102..a334924 100644 --- a/configs/profile/airootfs/root/customize_root_image-constants.inc +++ b/configs/profile/airootfs/root/customize_root_image-constants.inc @@ -49,4 +49,4 @@ 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 PRETTY_NAME="$(echo ${iso_title} | cut -d ' ' -f 5) - (${INSTALL_TYPE})" +readonly PRETTY_NAME="$(echo ${iso_title} | cut -d ' ' -f -5) - (${INSTALL_TYPE})" |