Merge branch 'master' of https://github.com/marmarek/qubes-core-agent-linux

Conflicts:
	archlinux/PKGBUILD.install

archlinux/PKGBUILD.install

@@ -1,5 +1,4 @@
 
-
 ###########################
 ## Pre-Install functions ##
 ###########################
@@ -71,7 +70,6 @@ configure_selinux() {
 	# sed -e s/^SELINUX=.*$/SELINUX=disabled/ -i /etc/selinux/config
 	# setenforce 0 2>/dev/null
 
-
 }
 
 ############################
@@ -149,7 +147,7 @@ PRESET_FAILED=0
 if [ $1 -eq 1 ]; then
     systemctl --no-reload preset-all > /dev/null 2>&1 && PRESET_FAILED=0 || PRESET_FAILED=1
 else
-    services="qubes-dvm qubes-misc-post qubes-firewall qubes-mount-home"
+    services="qubes-dvm qubes-misc-post qubes-firewall qubes-mount-dirs"
     services="$services qubes-netwatcher qubes-network qubes-sysinit"
     services="$services qubes-iptables qubes-updates-proxy qubes-qrexec-agent"
     services="$services qubes-random-seed"
@@ -252,8 +250,6 @@ post_install() {
 	
 }
 
-
-
 ## arg 1:  the new package version
 ## arg 2:  the old package version
 post_upgrade() {
@@ -263,13 +259,10 @@ post_upgrade() {
 	configure_notification-daemon
 	configure_selinux
 
-	configure_systemd 1
-
 	update_finalize
 
 	/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || :
 
-
 }
 
 ######################
@@ -299,12 +292,8 @@ post_remove() {
       rm /lib/firmware/updates
     fi
 
-    rm -rf /var/lib/qubes/xdg
+    for srv in qubes-dvm qubes-sysinit qubes-misc-post qubes-mount-dirs qubes-netwatcher qubes-network qubes-qrexec-agent; do
-    
-    for srv in qubes-dvm qubes-sysinit qubes-misc-post qubes-mount-home qubes-netwatcher qubes-network qubes-qrexec-agent; do
         systemctl disable $srv.service
     done
     
-    
 }
-

qubes-rpc/wrap-in-html-if-url.sh

@@ -14,4 +14,3 @@ wrap_in_html_if_url()
 	esac
 }
 
-		

rpm_spec/core-vm.spec

@@ -486,7 +486,7 @@ The Qubes core startup configuration for SystemD init.
 /lib/systemd/system/qubes-dvm.service
 /lib/systemd/system/qubes-misc-post.service
 /lib/systemd/system/qubes-firewall.service
-/lib/systemd/system/qubes-mount-home.service
+/lib/systemd/system/qubes-mount-dirs.service
 /lib/systemd/system/qubes-netwatcher.service
 /lib/systemd/system/qubes-network.service
 /lib/systemd/system/qubes-iptables.service
@@ -505,7 +505,7 @@ The Qubes core startup configuration for SystemD init.
 /usr/lib/qubes/init/qubes-iptables
 /usr/lib/qubes/init/misc-post.sh
 /usr/lib/qubes/init/misc-post-stop.sh
-/usr/lib/qubes/init/mount-home.sh
+/usr/lib/qubes/init/mount-dirs.sh
 /usr/lib/qubes/init/qubes-random-seed.sh
 /usr/lib/qubes/init/qubes-sysinit.sh
 /lib/systemd/system/chronyd.service.d/30_qubes.conf
@@ -526,7 +526,7 @@ PRESET_FAILED=0
 if [ $1 -eq 1 ]; then
     /bin/systemctl --no-reload preset-all > /dev/null 2>&1 && PRESET_FAILED=0 || PRESET_FAILED=1
 else
-    services="qubes-dvm qubes-misc-post qubes-firewall qubes-mount-home"
+    services="qubes-dvm qubes-misc-post qubes-firewall qubes-mount-dirs"
     services="$services qubes-netwatcher qubes-network qubes-sysinit"
     services="$services qubes-iptables qubes-updates-proxy qubes-qrexec-agent"
     services="$services qubes-random-seed"
@@ -573,6 +573,6 @@ if [ "$1" != 0 ] ; then
     exit 0
 fi
 
-for srv in qubes-dvm qubes-sysinit qubes-misc-post qubes-mount-home qubes-netwatcher qubes-network qubes-qrexec-agent; do
+for srv in qubes-dvm qubes-sysinit qubes-misc-post qubes-mount-dirs qubes-netwatcher qubes-network qubes-qrexec-agent; do
     /bin/systemctl disable $srv.service
 do

vm-systemd/75-qubes-vm.preset

@@ -66,7 +66,7 @@ enable qubes-updates-proxy.service
 enable qubes-dvm.service
 enable qubes-network.service
 enable qubes-qrexec-agent.service
-enable qubes-mount-home.service
+enable qubes-mount-dirs.service
 enable qubes-firewall.service
 enable qubes-netwatcher.service
 enable qubes-meminfo-writer.service

vm-systemd/qubes-misc-post.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=Qubes misc post-boot actions
-After=qubes-dvm.service qubes-mount-home.service
+After=qubes-dvm.service qubes-mount-dirs.service
 
 [Service]
 Type=oneshot

vm-systemd/qubes-mount-dirs.service

@@ -5,7 +5,7 @@ Before=qubes-gui-agent.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/lib/qubes/init/mount-home.sh
+ExecStart=/usr/lib/qubes/init/mount-dirs.sh
 # Fedora and Debian have different paths for fuser
 ExecStop=/bin/sh -c 'fuser -kMm /home' ; /bin/umount /home
 ExecStopPost=-/bin/umount /rw