From bad5f10d82d1ffb23749bb8267c041380fbab309 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 3 Feb 2017 12:22:45 +0100
Subject: [run-virt/dhcp-busybox] Get WINS server from upstream DHCP, pass on
 to VMs via local DHCPD

---
 core/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc++ | 2 +-
 core/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'core/modules/dhcpc-busybox')

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
-- 
cgit v1.2.3-55-g7522