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
2016-01-06 23:08:33 +00:00 · 2016-01-06 23:08:33 +00:00 · 184f49dbbd
commit 184f49dbbd
parent 7e8649f8c7
1 changed files with 7 additions and 0 deletions
--- 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() {