summaryrefslogtreecommitdiffstats
path: root/core/modules/dhcpc-busybox
diff options
context:
space:
mode:
authorSimon Rettberg2017-02-03 12:22:45 +0100
committerSimon Rettberg2017-02-03 12:22:45 +0100
commitbad5f10d82d1ffb23749bb8267c041380fbab309 (patch)
treedd24e35d70f24499f6c468e839023c5a8821de8e /core/modules/dhcpc-busybox
parent[rfs-s32] copy /usr/lib/ssl/openssl.cnf (diff)
downloadmltk-bad5f10d82d1ffb23749bb8267c041380fbab309.tar.gz
mltk-bad5f10d82d1ffb23749bb8267c041380fbab309.tar.xz
mltk-bad5f10d82d1ffb23749bb8267c041380fbab309.zip
[run-virt/dhcp-busybox] Get WINS server from upstream DHCP, pass on to VMs via local DHCPD
Diffstat (limited to 'core/modules/dhcpc-busybox')
-rwxr-xr-xcore/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc++2
-rwxr-xr-xcore/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx5
2 files changed, 6 insertions, 1 deletions
diff --git a/core/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc++ b/core/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc++
index 76c4fe95..2f8b878d 100755
--- a/core/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc++
+++ b/core/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc++
@@ -8,7 +8,7 @@ UDHCPC_OPTS=""
mkdir -p /run/udhcpc || echo "Could not create '/run/udhcpc'."
-/opt/openslx/sbin/udhcpc $UDHCPC_OPTS -O domain -O nissrv -O nisdomain -O wpad -O search -t 8 -s /opt/openslx/scripts/udhcpc-openslx -i "$NET_IF" -p "/run/udhcpc/udhcpc.$NET_IF.pid"
+/opt/openslx/sbin/udhcpc $UDHCPC_OPTS -O domain -O nissrv -O nisdomain -O wpad -O search -O wins -t 8 -s /opt/openslx/scripts/udhcpc-openslx -i "$NET_IF" -p "/run/udhcpc/udhcpc.$NET_IF.pid"
RET=$?
if [ "$RET" != 0 ]; then
diff --git a/core/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx b/core/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx
index 776f3f3b..13de9ff4 100755
--- a/core/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx
+++ b/core/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx
@@ -147,6 +147,11 @@ case "$1" in
sed -i "/^SLX_NET_SEARCH=/d" /opt/openslx/config
echo "SLX_NET_SEARCH='$search'" >> /opt/openslx/config
fi
+ # Same for WINS servers
+ if [ -z "$SLX_NET_WINS" ] && [ -n "$wins" ]; then
+ sed -i "/^SLX_NET_WINS=/d" /opt/openslx/config
+ echo "SLX_NET_WINS='$wins'" >> /opt/openslx/config
+ fi
# Only if network is not ready yet
if [ ! -e "/run/network/network-ready" ]; then