From 6547577ce9fa3e578e5a76457e04ef252909ffd9 Mon Sep 17 00:00:00 2001 From: Olivier MEDOC Date: Mon, 3 Feb 2014 20:35:34 +0100 Subject: [PATCH] archlinux: fix bugs in added package install/remove commands --- archlinux/PKGBUILD.install | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install index 19e9c71..685875e 100644 --- a/archlinux/PKGBUILD.install +++ b/archlinux/PKGBUILD.install @@ -169,17 +169,14 @@ pre_install() { mkdir -p /var/lib/qubes - # Backup fstab + # Backup fstab / But use archlinux defaults (cp instead of mv) if [ -e /etc/fstab ] ; then - mv /etc/fstab /var/lib/qubes/fstab.orig + cp /etc/fstab /var/lib/qubes/fstab.orig fi # Add qubes core related fstab entries echo "xen /proc/xen xenfs defaults 0 0" >> /etc/fstab echo "/dev/xvdi /mnt/removable auto noauto,user,rw 0 0" >> /etc/fstab - #if [ -e /etc/fstab ] ; then - # mv /etc/fstab /var/lib/qubes/fstab.orig - #fi # Archlinux bash version has a 'bug' when running su -c, /etc/profile is not loaded because bash consider there is no interactive pty when running 'su - user -c' or something like this. # See https://bugs.archlinux.org/task/31831 @@ -215,7 +212,6 @@ mkdir -p /rw post_upgrade() { update_xdgstart -update_qubesconfig update_systemd } @@ -251,9 +247,11 @@ post_remove() { rm /lib/firmware/updates fi - for srv in qubes-dvm qubes-sysinit qubes-misc-post qubes-netwatcher qubes-network qubes-firewall qubes-qrexec-agent qubes-update-check qubes-yum-proxy qubes-meminfo-writer; do + for srv in qubes-dvm qubes-sysinit qubes-misc-post qubes-netwatcher qubes-network qubes-firewall qubes-qrexec-agent qubes-yum-proxy; do systemctl disable $srv.service done + systemctl disable qubes-update-check.timer + }