diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
| commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
| tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /poky/meta/recipes-core/initrdscripts/initramfs-framework/rootfs | |
| parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
| parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
| download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz | |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'poky/meta/recipes-core/initrdscripts/initramfs-framework/rootfs')
| -rw-r--r-- | poky/meta/recipes-core/initrdscripts/initramfs-framework/rootfs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/poky/meta/recipes-core/initrdscripts/initramfs-framework/rootfs b/poky/meta/recipes-core/initrdscripts/initramfs-framework/rootfs index 748c9391c..ee24e82af 100644 --- a/poky/meta/recipes-core/initrdscripts/initramfs-framework/rootfs +++ b/poky/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. |