Hello community, here is the log from the commit of package dhcp checked in at Fri Aug 24 23:23:28 CEST 2007. -------- --- dhcp/dhcp.changes 2007-07-30 13:07:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcp/dhcp.changes 2007-08-24 10:26:04.262137000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 24 10:25:29 CEST 2007 - mt@suse.de + +- Removed getcfg interface config to interface name conversions + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.s31942/_old 2007-08-24 23:22:56.000000000 +0200 +++ /var/tmp/diff_new_pack.s31942/_new 2007-08-24 23:22:56.000000000 +0200 @@ -23,7 +23,7 @@ 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 @@ %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 ++++++ rc.dhcpd ++++++ --- dhcp/rc.dhcpd 2007-07-30 13:07:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcp/rc.dhcpd 2007-08-24 10:22:11.000000000 +0200 @@ -128,16 +128,6 @@ 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 ++++++ rc.dhcrelay ++++++ --- dhcp/rc.dhcrelay 2007-07-30 13:07:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcp/rc.dhcrelay 2007-08-24 10:22:32.000000000 +0200 @@ -79,16 +79,6 @@ 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 ++++++ sysconfig.dhcpd ++++++ --- dhcp/sysconfig.dhcpd 2007-07-30 13:07:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcp/sysconfig.dhcpd 2007-08-24 10:23:31.000000000 +0200 @@ -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="" ++++++ sysconfig.dhcrelay ++++++ --- dhcp/sysconfig.dhcrelay 2007-07-30 13:07:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcp/sysconfig.dhcrelay 2007-08-24 10:24:00.000000000 +0200 @@ -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="" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org