summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorben2015-11-20 16:11:27 +0100
committertorben2015-11-20 16:11:27 +0100
commit1971d7566787680646c6771bbb92c776ed7ee376 (patch)
tree6a44366b7af812716e9ee71a86a4d21405f1cfce
parentSupporting open slx configuration file. (diff)
downloadsystemd-init-1971d7566787680646c6771bbb92c776ed7ee376.tar.gz
systemd-init-1971d7566787680646c6771bbb92c776ed7ee376.tar.xz
systemd-init-1971d7566787680646c6771bbb92c776ed7ee376.zip
Fix.
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh2
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh4
2 files changed, 0 insertions, 6 deletions
diff --git a/builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh b/builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh
index 7922ce2a..411b2f7d 100755
--- a/builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh
@@ -9,8 +9,6 @@ if [[ $return_code != 0 ]]; then
warn "Downloading OpenSLX configuration file from \"${SLX_SERVER}${SLX_SERVER_BASE}${configuration_file_name}\" failed. Return code: $return_code"
emergency_shell -n "$0"
return 1
-else
- return 0
fi
source "/$configuration_file_name"
mkdir --parents "$SLX_CONFIGURATION_LOCATION"
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 1e76f2ea..7d942ca3 100755
--- a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
@@ -1,9 +1,5 @@
source "/usr/lib/utils.sh"
-declare -rg DNBD3_IMAGE="archLinux.vdi"
-declare -rg DNBD3_RID="0"
-declare -rg DNBD3_DEVICE="/dev/dnbd0"
-
# Close previous connections to be able to run this script many times.
dnbd3-client --device "$SLX_DNBD3_DEVICE" --close && \
if ! systemd-preserve-process-marker dnbd3-client --host "$SLX_DNBD3_SERVERS" \