summaryrefslogtreecommitdiff
path: root/configs/profile/root-image
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2018-04-18 03:05:08 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2020-03-27 19:32:28 -0400
commit00bae7c58cacd29b15d0bb65858ac3b7a537cf95 (patch)
tree55f1bdc4e5193ce4d4c55544a97b90929dc75a6a /configs/profile/root-image
parent6408c1738ac6b01baed6eeb395919b6c143ae59f (diff)
housekeeping
Diffstat (limited to 'configs/profile/root-image')
-rw-r--r--configs/profile/root-image/etc/motd2
-rw-r--r--configs/profile/root-image/etc/pacman.conf25
-rwxr-xr-xconfigs/profile/root-image/root/customize_root_image.sh9
3 files changed, 1 insertions, 35 deletions
diff --git a/configs/profile/root-image/etc/motd b/configs/profile/root-image/etc/motd
index 02d05ef..67330df 100644
--- a/configs/profile/root-image/etc/motd
+++ b/configs/profile/root-image/etc/motd
@@ -7,7 +7,7 @@
 #### |_| \__,_|_| \___,_|_,__/ \___/|_|\__,_| libre
 ###
 ###
- ## Free as in freedom
+ ## Free as in Freedom
 #
========================================================================
diff --git a/configs/profile/root-image/etc/pacman.conf b/configs/profile/root-image/etc/pacman.conf
deleted file mode 100644
index d77556f..0000000
--- a/configs/profile/root-image/etc/pacman.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-
-[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 0c9d5c1..edd0a3f 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -17,15 +17,6 @@ chmod 440 /etc/sudoers.d/g_wheel
# configure pacman
sed -i "s|#Server|Server|" /etc/pacman.d/mirrorlist
-# 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
-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' ]]