diff options
| author | jandob | 2016-03-29 19:06:22 +0200 |
|---|---|---|
| committer | jandob | 2016-03-29 19:06:22 +0200 |
| commit | 7a14d8932f1f4bba79ba4e7b8d5fe4129788e4ac (patch) | |
| tree | 0de5de71c12e08e3783bc885fb7c30c4b0346c2b /builder/dnbd3-rootfs/hooks | |
| parent | add logging to file functionality (diff) | |
| parent | Fix. (diff) | |
| download | systemd-init-7a14d8932f1f4bba79ba4e7b8d5fe4129788e4ac.tar.gz systemd-init-7a14d8932f1f4bba79ba4e7b8d5fe4129788e4ac.tar.xz systemd-init-7a14d8932f1f4bba79ba4e7b8d5fe4129788e4ac.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init
Diffstat (limited to 'builder/dnbd3-rootfs/hooks')
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/prepare-root-partition.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh index 95d13e51..3e93253f 100755 --- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh +++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh @@ -85,15 +85,13 @@ else writable_device="$(losetup --find)" losetup "$writable_device" "$ramdisk_location" fi - - # endregion # region connect dnbd3 IFS_backup="$IFS" IFS="," return_code=1 for host in ${SLX_DNBD3_SERVERS}; do - logging.info "Trying host \"host\"." + logging.info "Trying host \"$host\"." if systemd-preserve-process-marker dnbd3-client --host "$host" --image \ "${SLX_DNBD3_IMAGE}" --device "$SLX_DNBD3_DEVICE" \ --rid "$SLX_DNBD3_RID" @@ -105,8 +103,9 @@ done IFS="$IFS_backup" if [[ $return_code != 0 ]]; then - logging.warn "Failed to connect '${SLX_DNBD3_IMAGE}' from" \ - "one of '$SLX_DNBD3_SERVERS' to '$SLX_DNBD3_DEVICE'." + logging.warn "Failed to connect \"${SLX_DNBD3_IMAGE}\" (revision" \ + "\"$SLX_DNBD3_RID\") from one of \"$SLX_DNBD3_SERVERS\" to" \ + "\"$SLX_DNBD3_DEVICE\"." exit 1 fi # endregion |