r13132: Old fix from Lars

tx
(This used to be commit 4488e1debb00f6e3b53c71826a91bae001250902)

diff --git a/packaging/Debian/debian-unstable/samba-common.dhcp b/packaging/Debian/debian-unstable/samba-common.dhcp
index 3b5a05ff5732473d4b9834f2e9d27efdb143dbe2..38743a4568a09cb414f20b5cb2747951adaa1776 100644 (file)
--- 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.