Hello community, here is the log from the commit of package SuSEfirewall2 checked in at Thu Aug 9 15:11:24 CEST 2007. -------- --- SuSEfirewall2/SuSEfirewall2.changes 2007-08-06 16:22:52.000000000 +0200 +++ /mounts/work_src_done/NOARCH/SuSEfirewall2/SuSEfirewall2.changes 2007-08-07 14:56:49.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 7 14:56:41 CEST 2007 - lnussel@suse.de + +- use hwdesc2iface to convert old eth-id-* and eth-bus-* interface + specifications to actual interface names. + +------------------------------------------------------------------- Old: ---- SuSEfirewall2-3.6_SVNr182.tar.bz2 New: ---- SuSEfirewall2-3.6_SVNr183.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SuSEfirewall2.spec ++++++ --- /var/tmp/diff_new_pack.Itw549/_old 2007-08-09 15:10:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Itw549/_new 2007-08-09 15:10:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package SuSEfirewall2 (Version 3.6_SVNr182) +# spec file for package SuSEfirewall2 (Version 3.6_SVNr183) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ # icecream 0 Name: SuSEfirewall2 -Version: 3.6_SVNr182 +Version: 3.6_SVNr183 Release: 1 License: GPL v2 or later Group: Productivity/Networking/Security @@ -196,6 +196,9 @@ rm -rf %{buildroot} %changelog +* Tue Aug 07 2007 - lnussel@suse.de +- use hwdesc2iface to convert old eth-id-* and eth-bus-* interface + specifications to actual interface names. * Mon Aug 06 2007 - lnussel@suse.de - don't try to load ip6tables modules if ipv6 is disabled (#297621) * Fri Jul 06 2007 - lnussel@suse.de ++++++ SuSEfirewall2-3.6_SVNr182.tar.bz2 -> SuSEfirewall2-3.6_SVNr183.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSEfirewall2-3.6_SVNr182/SuSEfirewall2 new/SuSEfirewall2-3.6_SVNr183/SuSEfirewall2 --- old/SuSEfirewall2-3.6_SVNr182/SuSEfirewall2 2007-08-06 16:20:29.000000000 +0200 +++ new/SuSEfirewall2-3.6_SVNr183/SuSEfirewall2 2007-08-07 14:53:37.000000000 +0200 @@ -268,6 +268,7 @@ export PATH="/sbin:/bin:/usr/sbin:/usr/bin" +hwdesc2iface=/etc/sysconfig/network/scripts/hwdesc2iface modinfo="/sbin/modinfo" TC="/usr/sbin/tc" IPTABLES_BIN="/usr/sbin/iptables" @@ -696,30 +697,38 @@ esac } -# set $ip and $net to list of ips and ip/prefix separated by space. set $dev to actual name of device +# set $dev to actual name of device $1 getdevinfo() { - local dev=`getcfg-interface "$1"` + local dev= + local d="$1" + local var="$2" + if [ -e /sys/class/net/"$d" ]; then + dev="$d" + else + local deprecatediface= + if [ -x /sbin/getcfg-interface ]; then + dev=`/sbin/getcfg-interface "$d"` + elif [ -x "$hwdesc2iface" ]; then + case "$d" in + *-id-*) dev=`$hwdesc2iface id ${d#*-id-}`; deprecatediface=1 ;; + *-bus-*) dev=`$hwdesc2iface bus ${d#*-bus-}`; deprecatediface=1 ;; + esac + fi - if [ "$?" -ne 0 -o -z "$dev" \ - -o ! -e /sys/class/net/"$dev" ]; then - return 1 + if [ -z "$dev" -o ! -e /sys/class/net/"$dev" ]; then + return 1 + fi + + if [ -n "$deprecatediface" ]; then + warning "$var: the notation '$d' is deprecated. Please use '$dev' instead" + fi fi echo "$dev" return 0 } -# find interface name for hardware description -function getcfg-interface() -{ - if [ -x /sbin/getcfg-interface ]; then - /sbin/getcfg-interface "$1" || echo "$1" - else - echo "$1" - fi -} - setlock() { if [ "$remove_bootlock" -ne 0 ]; then @@ -786,7 +795,7 @@ warning "ignoring deprecated interface 'auto' in $var" continue fi - dev=`getdevinfo "$dev"` || continue + dev=`getdevinfo "$dev" "$var"` || continue case "$dev" in *:*) continue; ;; esac devs="$devs $dev" @@ -889,7 +898,7 @@ continue fi fi - dev=`getdevinfo "$dev"` || continue + dev=`getdevinfo "$dev" FW_MASQ_DEV` || continue case "$dev" in *:*) continue; ;; esac devs="$devs $dev" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org