summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2017-12-30 14:37:23 -0500
committerbill-auger <mr.j.spam.me@gmail.com>2018-01-01 00:53:51 -0500
commit3e74065e7e917b657b52d8b934c6c86ad23460a6 (patch)
tree9d1ac590ee90739362904381b5140d7e92e146e7
parent795b8df7108a65e836acffb093747b333927dbb8 (diff)
stash
-rwxr-xr-xconfigs/profile/build.sh3
-rw-r--r--configs/profile/packages/packages-gui.all5
-rw-r--r--configs/profile/root-image/root/customize_root_image-constants.inc6
-rwxr-xr-xconfigs/profile/root-image/root/customize_root_image.sh2
4 files changed, 6 insertions, 10 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index 8922ed1..9a88c76 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -147,13 +147,12 @@ make_packages() {
# stash package cache for next build
mv ${work_dir}/${arch}/root-image/isorepo ${work_dir}/../isorepo-${arch} || true
fi
-echo "diff IN" ; ls -al ${work_dir}/${arch}/root-image/etc/pacman.d/gnupg/ ; diff -r /etc/pacman.d/gnupg/ ${work_dir}/${arch}/root-image/etc/pacman.d/gnupg/
+
# refresh pacman keyring in chroot
arch-chroot ${work_dir}/${arch}/root-image pacman-key --init && \
pacman-key --populate archlinux archlinux32 \
archlinuxarm parabola && \
pacman-key --refresh
-echo "diff OUT" ; ls -al ${work_dir}/${arch}/root-image/etc/pacman.d/gnupg/ ; diff -r /etc/pacman.d/gnupg/ ${work_dir}/${arch}/root-image/etc/pacman.d/gnupg/
}
# Copy mkinitcpio parabolaiso hooks and build initramfs (root-image)
diff --git a/configs/profile/packages/packages-gui.all b/configs/profile/packages/packages-gui.all
index 777e9e6..bec65cf 100644
--- a/configs/profile/packages/packages-gui.all
+++ b/configs/profile/packages/packages-gui.all
@@ -39,10 +39,6 @@ gparted
icedove
iceweasel
leafpad
-octopi
-octopi-cachecleaner
-octopi-notifier
-octopi-repoeditor
pidgin
qtox
ring-client-gnome
@@ -58,7 +54,6 @@ xdg-user-dirs
dmidecode
gxmessage
gvfs
-wbar
# Xserver
diff --git a/configs/profile/root-image/root/customize_root_image-constants.inc b/configs/profile/root-image/root/customize_root_image-constants.inc
index a334924..1e7fa20 100644
--- a/configs/profile/root-image/root/customize_root_image-constants.inc
+++ b/configs/profile/root-image/root/customize_root_image-constants.inc
@@ -9,7 +9,8 @@ readonly LOCALES="en_US\.UTF-8 \
readonly SYSTEMD_DELETE_FILES="/etc/conf.d/agetty.tty1 \
/etc/conf.d/hostname \
/etc/init.d/pacman-init \
- /etc/X11/Xwrapper.config"
+ /etc/X11/Xwrapper.config \
+/etc/systemd/system/pacman-init.service "
readonly OPENRC_DELETE_FILES="/etc/hostname \
/etc/systemd/scripts/choose-mirror \
/etc/systemd/system/choose-mirror.service \
@@ -17,8 +18,7 @@ readonly OPENRC_DELETE_FILES="/etc/hostname
/etc/systemd/system/getty@tty1.service.d/autologin.conf \
/etc/systemd/system/pacman-init.service "
readonly SYSTEMD_SERVICES_ALL="choose-mirror.service \
- multi-user.target \
- pacman-init.service "
+ multi-user.target "
readonly SYSTEMD_SERVICES_GUI="NetworkManager.service"
readonly OPENRC_SERVICES_ALL="dbus \
haveged \
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index 1c979e8..0cd7c9e 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -21,6 +21,7 @@ sed -i "s|#Server|Server|" /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:
# cp /etc/pacman.conf /etc/pacman-offline.conf ; cp /etc/pacman.conf /etc/pacman-online.conf
@@ -74,6 +75,7 @@ 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