fix

1 files changed, 8 insertions, 5 deletions

diff --git a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
index 38817dea..490d1a11 100755
--- a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
@@ -20,7 +20,8 @@ for host in ${SLX_DNBD3_SERVERS}; do
 done
 IFS="$IFS_backup"
 if [[ $return_code != 0 ]]; then
-    warn "Failed to connect \"${SLX_SERVER_BASE#/}${SLX_DNBD3_IMAGE}\" from one of \"$SLX_DNBD3_SERVERS\" to \"$SLX_DNBD3_DEVICE\"."
+    warn "Failed to connect '${SLX_SERVER_BASE#/}${SLX_DNBD3_IMAGE}' from" \
+        "one of '$SLX_DNBD3_SERVERS' to '$SLX_DNBD3_DEVICE'."
     emergency_shell -n "Error in $0"
     return 1
 fi
@@ -33,15 +34,16 @@ touch $nbd_device
 udevadm settle
 
 local read_only_partition=$(utils.find_block_device \
-    "$SLX_SYSTEM_PARTITION_IDENTIFIER")
+    "$SLX_SYSTEM_PARTITION_IDENTIFIER" "$nbd_device")
 if [ -z "$read_only_partition" ]; then
-    warn no partition found on device "$nbd_device"
+    logging.warn "no partition  with identifier " \
+        "'$SLX_SYSTEM_PARTITION_IDENTIFIER' found on device"
     emergency_shell
 fi
 # Make read-only partition writable.
 ## detect partition for persistent storage
-local persistent_device="$(utils.find_block_device \
-    "$SLX_WRITABLE_DEVICE_IDENTIFIER")"
+local persistent_device=$(utils.find_block_device \
+    "$SLX_WRITABLE_DEVICE_IDENTIFIER")
 # TODO move somewhere else
 #local tmp_device="$(utils.find_block_device \
     #'$SLX_TMP_PARTITION_IDENTIFIER')"
@@ -75,6 +77,7 @@ fi
 
 local partition_size="$(blockdev --getsz "$read_only_partition")"
 local writable_partition_name='root'
+logging.info "Using read-only device: $read_only_partition"
 logging.info "Using writable device $writable_device, persistency: $persistent"
 local chunksize='1'
 modprobe dm_snapshot