svn commit: samba r13296 -
branches/SAMBA_3_0/packaging/Debian/debian-unstable
trunk/packaging/Debian/debian-unstable
lmuelle at samba.org
lmuelle at samba.org
Thu Feb 2 21:34:41 GMT 2006
Author: lmuelle
Date: 2006-02-02 21:34:40 +0000 (Thu, 02 Feb 2006)
New Revision: 13296
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13296
Log:
Align trunk with branches/SAMBA_3_0.
Add missing '\' in branches/SAMBA_3_0.
Modified:
branches/SAMBA_3_0/packaging/Debian/debian-unstable/samba-common.dhcp
trunk/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-02-02 21:29:51 UTC (rev 13295)
+++ branches/SAMBA_3_0/packaging/Debian/debian-unstable/samba-common.dhcp 2006-02-02 21:34:40 UTC (rev 13296)
@@ -15,7 +15,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" ]
+ && [ "$new_netbios_scope" = "$old_netbios_scope" ] \
&& [ -f $SAMBA_DHCP_CONF ]
then
return
Modified: trunk/packaging/Debian/debian-unstable/samba-common.dhcp
===================================================================
--- trunk/packaging/Debian/debian-unstable/samba-common.dhcp 2006-02-02 21:29:51 UTC (rev 13295)
+++ trunk/packaging/Debian/debian-unstable/samba-common.dhcp 2006-02-02 21:34:40 UTC (rev 13296)
@@ -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
@@ -14,7 +15,8 @@
# Nor should we continue if no settings have changed
if [ "$new_netbios_name_servers" = "$old_netbios_name_servers" ] \
- && [ "$new_netbios_scope" = "$old_netbios_scope" ]
+ && [ "$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.
More information about the samba-cvs
mailing list