From 7c5aa0d3eaa59e472d96bbcbebcf2c1879feb1f0 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@mimuw.edu.pl>
Date: Sat, 16 Jul 2011 02:21:41 +0200
Subject: [PATCH] dom0: Place DispVM savefile in shm only when exists (#262)

---
 dom0/init.d/qubes_setupdvm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/dom0/init.d/qubes_setupdvm b/dom0/init.d/qubes_setupdvm
index ba4e5d02..73af9a1f 100755
--- a/dom0/init.d/qubes_setupdvm
+++ b/dom0/init.d/qubes_setupdvm
@@ -23,17 +23,19 @@ start()
     printf "\x00\x00\x00\x00" > /var/run/qubes/dispVM_seq
     chown root:qubes /var/run/qubes/dispVM_seq
     chmod 660 /var/run/qubes/dispVM_seq
-    ROOT=/var/lib/qubes/dvmdata/savefile_root
     DEFAULT=/var/lib/qubes/dvmdata/default_savefile
-    if [ -f /var/lib/qubes/dvmdata/dont_use_shm ] ; then
-        ln -s $DEFAULT /var/run/qubes/current_savefile
-    else
-        mkdir -m 770 /dev/shm/qubes
-        chown root.qubes /dev/shm/qubes
-        cp -a $(readlink $DEFAULT) /dev/shm/qubes/current_savefile
-        chown root.qubes /dev/shm/qubes/current_savefile
-        chmod 660 /dev/shm/qubes/current_savefile
-        ln -s /dev/shm/qubes/current_savefile /var/run/qubes/current_savefile
+    # setup DispVM files only when they exists
+    if [ -r $DEFAULT ]; then
+        if [ -f /var/lib/qubes/dvmdata/dont_use_shm ] ; then
+            ln -s $DEFAULT /var/run/qubes/current_savefile
+        else
+            mkdir -m 770 /dev/shm/qubes
+            chown root.qubes /dev/shm/qubes
+            cp -a $(readlink $DEFAULT) /dev/shm/qubes/current_savefile
+            chown root.qubes /dev/shm/qubes/current_savefile
+            chmod 660 /dev/shm/qubes/current_savefile
+            ln -s /dev/shm/qubes/current_savefile /var/run/qubes/current_savefile
+        fi
     fi
 
     touch /var/lock/subsys/qubes_setupdvm