From f063b4a90fbd94c4f84d24e50a6e930725b06675 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Wed, 14 Oct 2015 21:09:49 +0200 Subject: [PATCH] Renamed qubes-mount-home to qubes-mount-dirs. Renamed qubes-mount-home service and mount-home.sh script to qubes-mount-dirs service and mount-dirs.sh. Because mount-home.sh also processed /rw/usrlocal. preparation to fix the following issues: - upstream bind-directories functionality to Qubes - https://phabricator.whonix.org/T414 - Bind mount /rw/usrlocal -> /usr/local instead of symlink - https://github.com/QubesOS/qubes-issues/issues/1150 - /bin/sync hangs forever in whonix-ws-dvm - https://github.com/QubesOS/qubes-issues/issues/1328 --- archlinux/PKGBUILD.install | 4 ++-- rpm_spec/core-vm.spec | 8 ++++---- vm-systemd/75-qubes-vm.preset | 2 +- vm-systemd/{mount-home.sh => mount-dirs.sh} | 0 vm-systemd/qubes-misc-post.service | 2 +- ...{qubes-mount-home.service => qubes-mount-dirs.service} | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename vm-systemd/{mount-home.sh => mount-dirs.sh} (100%) rename vm-systemd/{qubes-mount-home.service => qubes-mount-dirs.service} (87%) diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install index 160ab1c..2ee3840 100644 --- a/archlinux/PKGBUILD.install +++ b/archlinux/PKGBUILD.install @@ -333,7 +333,7 @@ post_upgrade() { configure_selinux configure_networkmanager - 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-updates-proxy qubes-qrexec-agent" for srv in $services; do @@ -374,7 +374,7 @@ post_remove() { rm /lib/firmware/updates 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 systemctl disable $srv.service done diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index 007e50f..42c9c5b 100644 --- a/rpm_spec/core-vm.spec +++ b/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 diff --git a/vm-systemd/75-qubes-vm.preset b/vm-systemd/75-qubes-vm.preset index a19c977..ec888a0 100644 --- a/vm-systemd/75-qubes-vm.preset +++ b/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 diff --git a/vm-systemd/mount-home.sh b/vm-systemd/mount-dirs.sh similarity index 100% rename from vm-systemd/mount-home.sh rename to vm-systemd/mount-dirs.sh diff --git a/vm-systemd/qubes-misc-post.service b/vm-systemd/qubes-misc-post.service index 8450a12..bd29ab2 100644 --- a/vm-systemd/qubes-misc-post.service +++ b/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 diff --git a/vm-systemd/qubes-mount-home.service b/vm-systemd/qubes-mount-dirs.service similarity index 87% rename from vm-systemd/qubes-mount-home.service rename to vm-systemd/qubes-mount-dirs.service index 5398872..cd8639d 100644 --- a/vm-systemd/qubes-mount-home.service +++ b/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