summaryrefslogtreecommitdiffstats
path: root/builder
diff options
context:
space:
mode:
Diffstat (limited to 'builder')
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh8
m---------builder/dnbd3-rootfs/scripts/rebash0
2 files changed, 6 insertions, 2 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 446433b3..63ef7d1f 100755
--- a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
@@ -27,9 +27,13 @@ fi
local nbd_device='/dev/nbd0'
systemd-preserve-process-marker qemu-nbd --connect="$nbd_device" \
"$SLX_DNBD3_DEVICE" --read-only
-local read_only_partition="$(utils.create_partition_via_offset "$nbd_device" \
- "$SLX_SYSTEM_PARTITION_IDENTIFIER")"
+if [ -n $SLX_SYSTEM_PARTITION_IDENTIFIER ]; then
+ local read_only_partition="$(utils.create_partition_via_offset \
+ "$nbd_device" "$SLX_SYSTEM_PARTITION_IDENTIFIER")"
+else # assume raw disk
+ local read_only_partition="$nbd_device"
+fi
# Make read-only partition writable.
## detect partition for persistent storage
local persistent_device=$(utils.find_block_device \
diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash
-Subproject 60555ec672f3aca994d19c89cac47ae8e0b8666
+Subproject de05b6e940d4dc72dcd1747832f43917aa8a93b