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> | 2018-01-01 00:53:23 -0500 |
| commit | 7341b211b33bd208e345cfdac5909c42dfbb9150 (patch) | |
| tree | a4ab1da06d6d1f1f282fc97c6d3d087572b653e6 /configs/profile/root-image/root/customize_root_image.sh | |
| parent | 9261216e0d259d05b6e76d111d22d9cc59414191 (diff) | |
squashme skel
Diffstat (limited to 'configs/profile/root-image/root/customize_root_image.sh')
| -rwxr-xr-x | configs/profile/root-image/root/customize_root_image.sh | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh index 7d626ba..4be89e0 100755 --- a/configs/profile/root-image/root/customize_root_image.sh +++ b/configs/profile/root-image/root/customize_root_image.sh @@ -17,12 +17,21 @@ 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 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 +echo "ls /etc/pacman.d/gnupg/ IN" ; ls -al /etc/pacman.d/gnupg/ # FIXME: +rm -rf /etc/pacman.d/gnupg/ +pacman-key --init +pacman-key --populate archlinux archlinux32 archlinuxarm parabola +pacman-key --refresh +echo "ls /etc/pacman.d/gnupg/ OUT" ; ls -al /etc/pacman.d/gnupg/ # FIXME: # configure services if [[ "${iso_init}" == 'systemd' ]] @@ -50,8 +59,8 @@ usermod -s ${DEFAULT_SHELL} root 2> /dev/null 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 @@ -79,6 +88,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 |