svn commit: samba r13132 - in branches/SAMBA_3_0/packaging/Debian/debian-unstable: .

[idra at samba.org]

Author: idra
Date: 2006-01-25 15:12:18 +0000 (Wed, 25 Jan 2006)
New Revision: 13132

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13132

Log:

Old fix from Lars
tx


Modified:
   branches/SAMBA_3_0/packaging/Debian/debian-unstable/samba-common.dhcp


Changeset:
Modified: branches/SAMBA_3_0/packaging/Debian/debian-unstable/samba-common.dhcp
===================================================================
--- branches/SAMBA_3_0/packaging/Debian/debian-unstable/samba-common.dhcp	2006-01-25 12:54:30 UTC (rev 13131)
+++ branches/SAMBA_3_0/packaging/Debian/debian-unstable/samba-common.dhcp	2006-01-25 15:12:18 UTC (rev 13132)
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 SAMBA_DHCP_CONF=/etc/samba/dhcp.conf
+SAMBA_DHCP_CONF_INFO_FILE=""
 
 netbios_setup() {
 	# No need to continue if we're called with an unsupported option
@@ -15,6 +16,7 @@
 	# Nor should we continue if no settings have changed
 	if [ "$new_netbios_name_servers" = "$old_netbios_name_servers" ] \
 	   && [ "$new_netbios_scope" = "$old_netbios_scope" ]
+	   && [ -f $SAMBA_DHCP_CONF ]
 	then
 		return
 	fi
@@ -33,6 +35,8 @@
 	done
 
 	echo -n > $SAMBA_DHCP_CONF
+	test -n "$SAMBA_DHCP_CONF_INFO_FILE" -a -f "$SAMBA_DHCP_CONF_INFO_FILE" && \
+		cat "$SAMBA_DHCP_CONF_INFO_FILE" >> $SAMBA_DHCP_CONF
 
 	# If we're updating on failure/expire, AND there are no WINS
 	# servers for other interfaces, leave the file empty.