This commit is contained in:
parent
da59e30098
commit
0341434b10
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 24 10:25:29 CEST 2007 - mt@suse.de
|
||||
|
||||
- Removed getcfg interface config to interface name conversions
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 30 13:06:43 CEST 2007 - thoenig@suse.de
|
||||
|
||||
|
@ -23,7 +23,7 @@ License: BSD 3-Clause
|
||||
Group: Productivity/Networking/Boot/Servers
|
||||
Autoreqprov: on
|
||||
Version: 3.0.6
|
||||
Release: 6
|
||||
Release: 14
|
||||
Summary: Common Files Used by ISC DHCP Software
|
||||
URL: http://www.isc.org/isc/dhcp.html
|
||||
Source0: http://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
|
||||
@ -486,6 +486,8 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
|
||||
%doc %{_mandir}/man3/dhcpctl.3.gz
|
||||
|
||||
%changelog
|
||||
* Fri Aug 24 2007 - mt@suse.de
|
||||
- Removed getcfg interface config to interface name conversions
|
||||
* Mon Jul 30 2007 - thoenig@suse.de
|
||||
- dhcp-3.0.3-dhclient-script-dhcdbd.patch: dbus-send is now located
|
||||
in /bin
|
||||
|
10
rc.dhcpd
10
rc.dhcpd
@ -128,16 +128,6 @@ case "$1" in
|
||||
DHCPD_INTERFACE=""
|
||||
fi
|
||||
|
||||
# it might be necessary to convert "configuration names" (as in
|
||||
# /etc/sysconfig/network/ifcfg-* into "interface names" (like eth*)
|
||||
if [ -x /sbin/getcfg-interface ]; then
|
||||
unset interfaces
|
||||
for i in $DHCPD_INTERFACE; do
|
||||
interfaces="$interfaces$(/sbin/getcfg-interface $i) "
|
||||
done
|
||||
DHCPD_INTERFACE=$interfaces
|
||||
fi
|
||||
|
||||
jail=/var/lib/dhcp; leases=dhcpd.leases
|
||||
if ! [ -e $jail/db/$leases ]; then
|
||||
# until 9.0, the lease file was in /var/lib/dhcp and part of the package
|
||||
|
10
rc.dhcrelay
10
rc.dhcrelay
@ -79,16 +79,6 @@ case "$1" in
|
||||
exit 6;
|
||||
fi
|
||||
|
||||
# it might be necessary to convert "configuration names" (as in
|
||||
# /etc/sysconfig/network/ifcfg-* into "interface names" (like eth*)
|
||||
if [ -x /sbin/getcfg-interface ]; then
|
||||
unset interfaces
|
||||
for i in $DHCRELAY_INTERFACES; do
|
||||
interfaces="$interfaces$(/sbin/getcfg-interface $i) "
|
||||
done
|
||||
DHCRELAY_INTERFACES=$interfaces
|
||||
fi
|
||||
|
||||
for i in $DHCRELAY_INTERFACES ; do
|
||||
DHCRELAY_INTERFACES_ARGS="$DHCRELAY_INTERFACES_ARGS -i $i"
|
||||
done
|
||||
|
@ -6,18 +6,12 @@
|
||||
#
|
||||
# Interface(s) for the DHCP server to listen on.
|
||||
#
|
||||
# Instead of the interface name, the name of its configuration can be given.
|
||||
# If the configuration file is named
|
||||
# /etc/sysconfig/network/ifcfg-eth-id-00:50:fc:e4:f2:65
|
||||
# then id-00:50:fc:e4:f2:65 would be suitable to identify the configuration.
|
||||
#
|
||||
# A special keyword is ANY, it will cause dhcpd to autodetect available
|
||||
# interfaces.
|
||||
#
|
||||
# Examples: DHCPD_INTERFACE="eth0"
|
||||
# DHCPD_INTERFACE="eth0 eth1 eth2 tr0 wlan0"
|
||||
# DHCPD_INTERFACE="internal0 internal1"
|
||||
# DHCPD_INTERFACE="id-00:50:fc:e4:f2:65 id-00:a0:24:cb:cc:5c wlan0"
|
||||
# DHCPD_INTERFACE="ANY"
|
||||
#
|
||||
DHCPD_INTERFACE=""
|
||||
|
@ -6,15 +6,9 @@
|
||||
#
|
||||
# Interface(s) for DHCP relay agent to listen on
|
||||
#
|
||||
# Instead of the interface name, the name of its configuration can be given.
|
||||
# If the configuration file is named
|
||||
# /etc/sysconfig/network/ifcfg-eth-id-00:50:fc:e4:f2:65
|
||||
# then id-00:50:fc:e4:f2:65 would be suitable to identify the configuration.
|
||||
#
|
||||
# Examples: DHCPD_INTERFACE="eth0"
|
||||
# DHCPD_INTERFACE="eth0 eth1 eth2 tr0 wlan0"
|
||||
# DHCPD_INTERFACE="internal0 internal1"
|
||||
# DHCPD_INTERFACE="id-00:50:fc:e4:f2:65 id-00:a0:24:cb:cc:5c wlan0"
|
||||
#
|
||||
DHCRELAY_INTERFACES=""
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user