From 184f49dbbdb960da13c737030d8af3d56aeff64e Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@riseup.net>
Date: Wed, 6 Jan 2016 23:08:33 +0000
Subject: [PATCH] also exit from bind-directories if file
 /var/run/qubes-service/qubes-dvm exists

Thanks to @marmarek for the suggestion!

https://github.com/QubesOS/qubes-issues/issues/1328#issuecomment-169483029
---
 vm-systemd/bind-dirs.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/vm-systemd/bind-dirs.sh b/vm-systemd/bind-dirs.sh
index 6647334..b91b566 100755
--- a/vm-systemd/bind-dirs.sh
+++ b/vm-systemd/bind-dirs.sh
@@ -31,6 +31,13 @@ prerequisite() {
       true "No TemplateBasedVM detected. Exiting."
       exit 0
    fi
+   if [ -f "/var/run/qubes-service/qubes-dvm" ]; then
+      # https://github.com/QubesOS/qubes-issues/issues/1328#issuecomment-169483029
+      # Do none of the following in a DispVM.
+      # During DispVM savefile generation, 'qubesdb-read /qubes-vm-persistence'
+      # outputs 'rw'.
+      exit 0
+   fi
 }
 
 init() {