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>2018-04-18 03:52:02 -0400
commit1fa241be2bc01ccddae427862fd4c5aeb87fb1e8 (patch)
tree1190aba2dad4b50cbbd038ffed8c57708c5ec17d /configs/profile/root-image
parent83200b7ac53429c82c8a81f5078fbd97deb4d923 (diff)
squashme - updated package list
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.sh13
3 files changed, 7 insertions, 33 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 0cd7c9e..13a606b 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -18,14 +18,14 @@ 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
-echo "Server = https://parabola.isacdaavid.info:8081/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist
+# if [[ "${arch}" == "i686" ]]
+# then echo "Server = https://repo.parabola.nu/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist
+# fi
+# echo "Server = https://parabola.isacdaavid.info:8081/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist
# KLUDGE end
-# KLUDGE begin temp until next calamares rebuild # FIXME:
+# 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
+# sed -i 's|requiredStorage:.*|requiredStorage: 8.9|' /usr/share/calamares/modules/welcome.conf
# KLUDGE end
# configure services
@@ -75,7 +75,6 @@ else # configure GUI login session and live user
fi
# configure desktop environment
-sed -i "s|.*octopi-notifier.*||" /home/${LIVE_USER}/.config/autostart/autostart-lxde.sh
sed -i "s|_EDITION_TITLE_|${PRETTY_NAME}|" /home/${LIVE_USER}/.config/autostart/autostart.sh
sed -i "s|,Don't show this again:0||" /home/${LIVE_USER}/.config/autostart/autostart.sh
sed -i "s|620x460|620x520|" /home/${LIVE_USER}/.config/autostart/autostart.sh