summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2006-01-25 15:12:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:06:14 -0500
commitf6adbe5d679fa2473d999a52ea9e887eb726f610 (patch)
tree0df8bcf3d3a5889c0a081e660871da716395499c
parent0bd71d77cb24f4273cefffafbaee060f9308da20 (diff)
downloadsamba-f6adbe5d679fa2473d999a52ea9e887eb726f610.tar.gz
samba-f6adbe5d679fa2473d999a52ea9e887eb726f610.tar.bz2
samba-f6adbe5d679fa2473d999a52ea9e887eb726f610.zip
r13132: Old fix from Lars
tx (This used to be commit 4488e1debb00f6e3b53c71826a91bae001250902)
-rw-r--r--packaging/Debian/debian-unstable/samba-common.dhcp4
1 files changed, 4 insertions, 0 deletions
diff --git a/packaging/Debian/debian-unstable/samba-common.dhcp b/packaging/Debian/debian-unstable/samba-common.dhcp
index 3b5a05ff57..38743a4568 100644
--- a/packaging/Debian/debian-unstable/samba-common.dhcp
+++ b/packaging/Debian/debian-unstable/samba-common.dhcp
@@ -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 @@ netbios_setup() {
# 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 @@ netbios_setup() {
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.