summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2018-11-12 12:41:54 +0100
committerJonathan Bauer2018-11-12 17:30:33 +0100
commitca65e05019cbfbef747771b22754990c53b42f0a (patch)
tree55942772c762a87f02bf10e03662c78ce9af021d
parent[dnbd3-rfs] config: send uuid if present (diff)
downloadsystemd-init-ca65e05019cbfbef747771b22754990c53b42f0a.tar.gz
systemd-init-ca65e05019cbfbef747771b22754990c53b42f0a.tar.xz
systemd-init-ca65e05019cbfbef747771b22754990c53b42f0a.zip
[dnbd3-rfs] config: add PXE server info to config
-rwxr-xr-xbuilder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh11
1 files changed, 9 insertions, 2 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh b/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh
index ae3f959d..212bda75 100755
--- a/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh
+++ b/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh
@@ -46,8 +46,15 @@ if [[ ! -s "/etc/openslx.tmp" ]]; then
return 1
fi
-# mark that the configuration variables came from remote
-sed -i '1i#_RCONFIG_TAG' /etc/openslx
+# remember kcl server and base
+(
+ echo "SLX_KCL_SERVERS='$slx_server'"
+ echo "SLX_BASE_PATH='$slx_server_base'"
+ echo '#_RCONFIG_TAG'
+) > /etc/openslx
+
+# finally copy remote config into it
+cat /etc/openslx.tmp >> /etc/openslx
# slxsrv overrides SLX_DNBD3_SERVERS if prefixed with @
[ "${slx_server#@}" != "${slx_server}" ] && sed -i "s/^SLX_DNBD3_SERVERS=.*/SLX_DNBD3_SERVERS='${slx_server#@}'/" "/etc/openslx"