initramfs-framework: check successful mount using mountpoint

Instead of checking for existence of /dev in the mounted file system use
mountpoint to check if a root file system has been mounted. This allows
to use the rootfs module for OSTree based rootfs as well, where the file
system rootfs does not have any of the regular directories (at least
when using the modern layout).

(From OE-Core rev: efdfd0d5dde4dde43cb67ef28a90d5f5fe3e0ac6)

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/rootfs b/meta/recipes-core/initrdscripts/initramfs-framework/rootfs
index 748c9391c0..ee24e82af3 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework/rootfs
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/rootfs
@@ -13,7 +13,7 @@ rootfs_run() {
         C=0
         delay=${bootparam_rootdelay:-1}
         timeout=${bootparam_roottimeout:-5}
-        while [ ! -d $ROOTFS_DIR/dev ]; do
+        while ! mountpoint -q $ROOTFS_DIR; do
                 if [ $(( $C * $delay )) -gt $timeout ]; then
                         fatal "root '$bootparam_root' doesn't exist or does not contain a /dev."
                 fi
@@ -61,7 +61,7 @@ rootfs_run() {
                                         flags="$flags -t$bootparam_rootfstype"
                                 fi
                                 mount $flags $bootparam_root $ROOTFS_DIR
-                                if [ -d $ROOTFS_DIR/dev ]; then
+                                if mountpoint -q $ROOTFS_DIR; then
                                         break
                                 else
                                         # It is unlikely to change, but keep trying anyway.