Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init

2 files changed, 8 insertions, 7 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 fc99226d..2e62434d 100755
--- a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
@@ -1,5 +1,7 @@
 # region imports
 source "/usr/lib/rebash/core.sh"
+core.import exceptions
+exceptions.activate
 core.import utils
 core.import logging
 logging.set_commands_log_level debug
@@ -7,19 +9,17 @@ logging.set_log_level debug
 # endregion
 
 # region connect dnbd3
-# Close previous connections to be able to run this script many times.
-dnbd3-client --device "$SLX_DNBD3_DEVICE" --close
 local IFS_backup="$IFS"
 IFS=","
 local host
 for host in ${SLX_DNBD3_SERVERS}; do
-    info "Trying host \"$host\"."
-    systemd-preserve-process-marker dnbd3-client --host "$host" --image \
+    logging.info "Trying host '$host'."
+    if systemd-preserve-process-marker dnbd3-client --host "$host" --image \
         "${SLX_SERVER_BASE#/}${SLX_DNBD3_IMAGE}" --device "$SLX_DNBD3_DEVICE" \
         --rid "$SLX_DNBD3_RID"
-    local return_code="$?"
-    [[ $return_code == 0 ]] && break
-    continue
+    then
+        break
+    fi
 done
 IFS="$IFS_backup"
 
@@ -106,6 +106,7 @@ modprobe dm_snapshot
 dmsetup create "$writable_partition_name" --noudevsync --table \
     "0 $partition_size snapshot $read_only_partition $writable_device $persistent $chunksize"
 dmsetup mknodes --noudevsync "$writable_partition_name"
+exceptions.deactivate
 # enregion
 
 # region vim modline
diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash
-Subproject 4d299c9e5eb6045fa18d4b017f75ae973dc4c9b
+Subproject 17747997bc1f562192125506cf38c95f001fd8d