Adapt to Honister

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/recipes-core/initrdscripts/files/init-readonly-rootfs-overlay-boot.sh b/recipes-core/initrdscripts/files/init-readonly-rootfs-overlay-boot.sh
index be62db0..66f0cdc 100644
--- a/recipes-core/initrdscripts/files/init-readonly-rootfs-overlay-boot.sh
+++ b/recipes-core/initrdscripts/files/init-readonly-rootfs-overlay-boot.sh
@@ -101,11 +101,11 @@ mount_and_boot() {
 
         # Mount root file system to new mount-point, if unsuccessful, try bind
         # mounting current root file system.
-        if ! $MOUNT $ROOT_ROMOUNTPARAMS "$ROOT_ROMOUNT" 2>/dev/null && \
-                [ "x$ROOT_ROMOUNTPARAMS_BIND" == "x$ROOT_ROMOUNTPARAMS" ] || \
-                log "Could not mount $ROOT_RODEVICE, bind mounting..." && \
-                ! $MOUNT $ROOT_ROMOUNTPARAMS_BIND "$ROOT_ROMOUNT"; then
-                fatal "Could not mount read-only rootfs"
+        if ! $MOUNT $ROOT_ROMOUNTPARAMS "$ROOT_ROMOUNT" 2>/dev/null ; then
+                log "Could not mount $ROOT_RODEVICE, bind mounting..."
+                if ! $MOUNT $ROOT_ROMOUNTPARAMS_BIND "$ROOT_ROMOUNT"; then
+            fatal "Could not mount read-only rootfs"
+        fi
         fi
 
         # Remounting root file system as read only.