diff options
-rw-r--r--[l---------] | configs/profile/root-image/etc/pacman.conf | 26 | ||||
-rwxr-xr-x | configs/profile/root-image/root/customize_root_image.sh | 6 |
2 files changed, 28 insertions, 4 deletions
diff --git a/configs/profile/root-image/etc/pacman.conf b/configs/profile/root-image/etc/pacman.conf index cec8b80..d77556f 120000..100644 --- a/configs/profile/root-image/etc/pacman.conf +++ b/configs/profile/root-image/etc/pacman.conf @@ -1 +1,25 @@ -root-image/etc/pacman-online.conf
\ No newline at end of file + +[options] +HoldPkg = pacman glibc +Architecture = auto +CheckSpace +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional + +[libre] +Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +[pcr] +Include = /etc/pacman.d/mirrorlist + +[pcr-testing] +Include = /etc/pacman.d/mirrorlist diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh index 414c9b3..1c979e8 100755 --- a/configs/profile/root-image/root/customize_root_image.sh +++ b/configs/profile/root-image/root/customize_root_image.sh @@ -23,7 +23,7 @@ then echo "Server = https://repo.parabola.nu/\$repo/os/\$arch" > /etc/pacman.d/m 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 +# 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 @@ -80,11 +80,11 @@ else # configure GUI login session and live user sed -i "s|/issue-tracker/|/isos/|" /home/${LIVE_USER}/Desktop/bug-tracker.desktop 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 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 + sed -i "s|_DESKTOP_SESSION_|LXDE|" /home/${LIVE_USER}/.bash_profile + sed -i "s|_DESKTOP_SESSION_|LXDE|" /home/${LIVE_USER}/.dmrc 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 |