]> xenbits.xensource.com Git - people/iwj/osstest.git/commitdiff
osstest-confirm-booted: Fix for Wheezy
authorIan Campbell <ian.campbell@citrix.com>
Fri, 6 Sep 2013 11:28:07 +0000 (12:28 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Fri, 6 Sep 2013 11:28:07 +0000 (12:28 +0100)
Under Wheezy /dev/sym is a symlink to /run/shm which is where the tmpfs is
mounted.

overlay/etc/init.d/osstest-confirm-booted

index ca0ccc399ebadb46dc1bd546e490da1e372f3922..bfaa36cd9e6cb29dd73c3edb0c0e45a3d05cd851 100755 (executable)
@@ -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