summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/profile/root-image/etc/systemd/system/pacman-init.service1
-rwxr-xr-xconfigs/profile/root-image/root/customize_root_image.sh6
2 files changed, 6 insertions, 1 deletions
diff --git a/configs/profile/root-image/etc/systemd/system/pacman-init.service b/configs/profile/root-image/etc/systemd/system/pacman-init.service
index 3414ebc..5d90af9 100644
--- a/configs/profile/root-image/etc/systemd/system/pacman-init.service
+++ b/configs/profile/root-image/etc/systemd/system/pacman-init.service
@@ -10,6 +10,7 @@ Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/bin/pacman-key --init
ExecStart=/usr/bin/pacman-key --populate archlinux
+ExecStart=/usr/bin/pacman-key --populate archlinux32
ExecStart=/usr/bin/pacman-key --populate parabola
[Install]
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index 62e7106..8d0b7b0 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -40,7 +40,7 @@ chmod 750 /etc/sudoers.d
chmod 440 /etc/sudoers.d/g_wheel
# configure pacman
-sed -i "s|#Server|Server|g" /etc/pacman.d/mirrorlist
+sed -i "s|#Server|Server|" /etc/pacman.d/mirrorlist
if [[ "${enable_offline_install}" == 'true' ]]
then cat /etc/pacman-offline.conf > /etc/pacman-online.conf
for repo in ${REPOS}
@@ -51,6 +51,10 @@ else cp /usr/share/pacman/defaults/pacman.conf.${arch} /etc/pacman
rm /etc/pacman-*.conf
fi
+# KLUDGE begin # TODO: https://labs.parabola.nu/issues/1527
+echo "Server = https://parabola.isacdaavid.info:8081/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist
+# KLUDGE end
+
# configure services
if [[ "${iso_init}" == 'systemd' ]]
then systemctl enable ${SYSTEMD_SERVICES_ALL}