summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/prepare-root-partition.sh8
-rw-r--r--dev-tools/example-openslx.config1
2 files changed, 6 insertions, 3 deletions
diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
index 3dc22978..4fc7e2ee 100755
--- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
@@ -15,9 +15,11 @@ logging.set_level debug
source /etc/openslx
# region find writable partition
-if [[ "$SLX_WRITABLE_DEVICE_IDENTIFIER" != "" ]] \
- && ! persistent_device=$(
- tools.find_block_device "$SLX_WRITABLE_DEVICE_IDENTIFIER")
+if [[ "$SLX_WRITABLE_DEVICE_IDENTIFIER" != "" ]] &&
+ ! persistent_device="$(
+ tools.find_block_device "$SLX_WRITABLE_DEVICE_IDENTIFIER" "" \
+ "$SLX_WRITABLE_DEVICE_IDENTIFIER_TIMEOUT"
+ )"
then
logging.warn "Failed to find unique device with identifier" \
"\"${SLX_WRITABLE_DEVICE_IDENTIFIER}\"; matched devices:" \
diff --git a/dev-tools/example-openslx.config b/dev-tools/example-openslx.config
index 122da9ae..47d37c43 100644
--- a/dev-tools/example-openslx.config
+++ b/dev-tools/example-openslx.config
@@ -6,6 +6,7 @@ SLX_DNBD3_IMAGE='archLinux/archLinux.vmdk'
# If empty the whole device is used
SLX_SYSTEM_PARTITION_IDENTIFIER='system'
SLX_WRITABLE_DEVICE_IDENTIFIER=''
+SLX_WRITABLE_DEVICE_IDENTIFIER_TIMEOUT=''
SLX_WRITABLE_DEVICE_STORAGE_FILE='storage.img'
# NOTE: if the filesystem is any other than ext4, then the corresponding
# filesystem tools have to be added to the initramfs manually. (use the dracut