summaryrefslogtreecommitdiffstats
path: root/builder/dnbd3-rootfs
diff options
context:
space:
mode:
authorjandob2016-03-22 15:10:02 +0100
committerjandob2016-03-22 15:10:02 +0100
commitfc8a01bb8f51137c06b1eb3a8c2a8c5a6a334f59 (patch)
tree4bdf342d15e909f3a4c41dbda7bc47517ecadbb4 /builder/dnbd3-rootfs
parentadd timeout parameter to find_block_device (diff)
downloadsystemd-init-fc8a01bb8f51137c06b1eb3a8c2a8c5a6a334f59.tar.gz
systemd-init-fc8a01bb8f51137c06b1eb3a8c2a8c5a6a334f59.tar.xz
systemd-init-fc8a01bb8f51137c06b1eb3a8c2a8c5a6a334f59.zip
add timeout parameter
Diffstat (limited to 'builder/dnbd3-rootfs')
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/prepare-root-partition.sh8
1 files changed, 5 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:" \