Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

archlinux: fix bugs in added package install/remove commands

Browse Source
This commit is contained in:
Olivier MEDOC 2014-02-03 20:35:34 +01:00 committed by Marek Marczykowski-Górecki
parent e0a00899cf
commit 6547577ce9
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archlinux/PKGBUILD.install
View File

@ -169,17 +169,14 @@ pre_install() {
mkdir -p /var/lib/qubes mkdir -p /var/lib/qubes
# Backup fstab # Backup fstab / But use archlinux defaults (cp instead of mv)
if [ -e /etc/fstab ] ; then if [ -e /etc/fstab ] ; then
mv /etc/fstab /var/lib/qubes/fstab.orig cp /etc/fstab /var/lib/qubes/fstab.orig
fi fi
# Add qubes core related fstab entries # Add qubes core related fstab entries
echo "xen /proc/xen xenfs defaults 0 0" >> /etc/fstab echo "xen /proc/xen xenfs defaults 0 0" >> /etc/fstab
echo "/dev/xvdi /mnt/removable auto noauto,user,rw 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. # 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 # See https://bugs.archlinux.org/task/31831
@ -215,7 +212,6 @@ mkdir -p /rw
post_upgrade() { post_upgrade() {
update_xdgstart update_xdgstart
update_qubesconfig
update_systemd update_systemd
} }
@ -251,9 +247,11 @@ post_remove() {
rm /lib/firmware/updates rm /lib/firmware/updates
fi 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 systemctl disable $srv.service
done done
systemctl disable qubes-update-check.timer
} }