From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 6 Sep 2013 11:28:07 +0000 (+0100)
Subject: osstest-confirm-booted: Fix for Wheezy
X-Git-Tag: wip.xsm-13-actual.base~460^2~16
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e164174157316b8fea296d79451de44719d2a755;p=people%2Fiwj%2Fosstest.git

osstest-confirm-booted: Fix for Wheezy

Under Wheezy /dev/sym is a symlink to /run/shm which is where the tmpfs is
mounted.
---

diff --git a/overlay/etc/init.d/osstest-confirm-booted b/overlay/etc/init.d/osstest-confirm-booted
index ca0ccc39..bfaa36cd 100755
--- a/overlay/etc/init.d/osstest-confirm-booted
+++ b/overlay/etc/init.d/osstest-confirm-booted
@@ -41,7 +41,13 @@ esac
 
 case "$1" in
   start|reload|force-reload)
-        if mount | egrep '^[^ 	][^ 	]* on /dev/shm type tmpfs ' >/dev/null
+        if mount | egrep '^[^ 	][^ 	]* on /run/shm type tmpfs ' >/dev/null
+        then
+                if [ `readlink -f /dev/shm` != "/run/shm" ] ; then
+                        echo >&2 '/dev/shm not a link to /run/shm ?'; exit 1
+                fi
+                touch /dev/shm/osstest-confirm-booted
+        elif mount | egrep '^[^ 	][^ 	]* on /dev/shm type tmpfs ' >/dev/null
         then
                 touch /dev/shm/osstest-confirm-booted
         else