From 1f680f04e8122339d645cccef4c1460de64e88db Mon Sep 17 00:00:00 2001
From: Dirk
Date: Wed, 24 Apr 2013 17:34:29 +0200
Subject: Add wpad option to udhcpc and udhcpd in vmware config ...

---
 src/initramfs/scripts/etc/functions                               | 4 ++--
 .../plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh      | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/initramfs/scripts/etc/functions b/src/initramfs/scripts/etc/functions
index fb67b472..417ff03b 100644
--- a/src/initramfs/scripts/etc/functions
+++ b/src/initramfs/scripts/etc/functions
@@ -1,5 +1,5 @@
 # Copyright (c) 2003..2006 - RZ Uni Freiburg
-# Copyright (c) 2006..2011 - OpenSLX GmbH
+# Copyright (c) 2006..2013 - OpenSLX GmbH
 #
 # This program/file is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -276,7 +276,7 @@ ln -sf /bin/dhcpmkconfig /usr/share/udhcpc/default.script
 # see for options.c file in udhcp subdir of busybox for accepted "-O option"
 # TODO: look into udhcpc code to find out how "search" OPT is called now
 #udhcpc -O search -O nissrv -O nisdomain -t 8 -q $vci \
-udhcpc -O domain -O nissrv -O nisdomain -t 8 -q $vci \
+udhcpc -O domain -O nissrv -O nisdomain -O wpad -t 8 -q $vci \
   -s /usr/share/udhcpc/default.script -i $nwif 2>/dev/null
 }
 
diff --git a/src/os-plugins/plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh b/src/os-plugins/plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh
index 5e76c1f0..1717a8db 100755
--- a/src/os-plugins/plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh
+++ b/src/os-plugins/plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2010,2011 - OpenSLX GmbH
+# Copyright (c) 2010..2013 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -18,9 +18,10 @@
 CONFDIR=/mnt/${OPENSLX_DEFAULT_CONFDIR}
 testmkd ${CONFDIR}
 
-# read the DNS configuration
+# read the DNS configuration and if available set WPAD configuration
 . /etc/initramfs-setup
 [ -z "${domain_name_servers}" ] && domain_name_servers="8.8.8.8"
+[ -n "${wpad}" ] && wpad_config="option  wpad    ${wpad}"
 
 # configuring dhcpd stub for virtual networks
 cat > ${CONFDIR}/udhcpd.conf << EOF
@@ -48,6 +49,7 @@ option	subnet	255.255.255.0
 option	router	CNETWORK.1
 option	wins	CNETWORK.10
 option	domain	virtual.site ${domain_name}
+${wpad_config}
 
 # additional options known to udhcpd
 #subnet			#timezone
@@ -60,5 +62,5 @@ option	domain	virtual.site ${domain_name}
 #mtu			#broadcast
 #wins			#lease
 #ntpsrv			#tftp
-#bootfile
+#bootfile		#wpad
 EOF
-- 
cgit v1.2.3-55-g7522