summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/prepare-root-partition.sh4
-rw-r--r--dev-tools/example-openslx.config2
2 files changed, 3 insertions, 3 deletions
diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
index 60b29882..88568995 100755
--- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
@@ -71,7 +71,7 @@ return_code=1
for host in ${SLX_DNBD3_SERVERS}; do
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" \
+ "${SLX_DNBD3_IMAGE}" --device "$SLX_DNBD3_DEVICE" \
--rid "$SLX_DNBD3_RID"
then
return_code=0
@@ -81,7 +81,7 @@ done
IFS="$IFS_backup"
if [[ $return_code != 0 ]]; then
- logging.warn "Failed to connect '${SLX_SERVER_BASE#/}${SLX_DNBD3_IMAGE}' from" \
+ logging.warn "Failed to connect '${SLX_DNBD3_IMAGE}' from" \
"one of '$SLX_DNBD3_SERVERS' to '$SLX_DNBD3_DEVICE'."
exit 1
fi
diff --git a/dev-tools/example-openslx.config b/dev-tools/example-openslx.config
index 1d765115..9a02d197 100644
--- a/dev-tools/example-openslx.config
+++ b/dev-tools/example-openslx.config
@@ -2,7 +2,7 @@ SLX_CONFIGURATION_LOCATION='/opt/openslx/'
SLX_DNBD3_SERVERS='132.230.4.201,132.230.4.202,10.0.2.2'
SLX_DNBD3_RID='0'
SLX_DNBD3_DEVICE='/dev/dnbd0'
-SLX_DNBD3_IMAGE='archLinux.vmdk'
+SLX_DNBD3_IMAGE='archLinux/archLinux.vmdk'
SLX_SYSTEM_PARTITION_IDENTIFIER='system'
SLX_TMP_PARTITION_IDENTIFIER=''
SLX_WRITABLE_DEVICE_IDENTIFIER=''