Ver Fonte

archlinux: fix bugs in added package install/remove commands

Olivier MEDOC há 10 anos atrás
pai
commit
6547577ce9
1 ficheiros alterados com 5 adições e 7 exclusões
  1. 5 7
      archlinux/PKGBUILD.install

+ 5 - 7
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
+
 }