Hello community, here is the log from the commit of package sysconfig for openSUSE:11.4 checked in at Fri Jul 1 13:28:30 CEST 2011.
-------- --- old-versions/11.4/all/sysconfig/sysconfig.changes 2011-02-14 14:59:46.000000000 +0100 +++ 11.4/sysconfig/sysconfig.changes 2011-06-09 17:27:35.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Jun 9 14:58:52 UTC 2011 - [email protected] + +- Fixed get_depending_ifaces to not return bonding slaves by + default as it is not required to stop the slaves before the + bonding master goes down and in fact it may cause a system + hang, when the slaves are infiniband child interfaces, that + are deleted while ifdown (bnc#698478). +- Fixed to use 600 mode in spec attr for ifcfg-lo to avoid that + rpm -V report it as modified because of the chmod added to the + post-install script in bnc#670871. + +------------------------------------------------------------------- +Tue Jun 7 19:20:43 CEST 2011 - [email protected] + +- Added WIRELESS_AUTH_MODE='no-encryption' option handling to + ifup-wireless, because YaST sets it (bnc#648830). + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/sysconfig Destination is old-versions/11.4/UPDATES/all/sysconfig calling whatdependson for 11.4-i586 New: ---- 0001-ifup-wireless-no-encryption-option.bnc648830.patch 0002-do-not-stop-bonding-slaves-first.bnc698478.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.S8RHJO/_old 2011-07-01 13:28:07.000000000 +0200 +++ /var/tmp/diff_new_pack.S8RHJO/_new 2011-07-01 13:28:07.000000000 +0200 @@ -20,7 +20,7 @@ Name: sysconfig Version: 0.74.5 -Release: 2 +Release: 6.<RELEASE7> Summary: The system configuration scheme Url: http://gitorious.org/opensuse/sysconfig Group: System/Base @@ -32,6 +32,8 @@ Requires: iproute2 dbus-1 procps BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 +Patch1: 0001-ifup-wireless-no-encryption-option.bnc648830.patch +Patch2: 0002-do-not-stop-bonding-slaves-first.bnc698478.patch %description This package provides the SuSE system configuration scheme and @@ -51,6 +53,8 @@ %prep %setup -n sysconfig-%{version} +%patch1 -p1 +%patch2 -p1 %build autoreconf --force --install @@ -87,7 +91,7 @@ /etc/init.d/* %ghost /etc/sysconfig/network/config %ghost /etc/sysconfig/network/dhcp -%config(noreplace) /etc/sysconfig/network/ifcfg-lo +%config(noreplace) %attr(600,root,root) /etc/sysconfig/network/ifcfg-lo %config(noreplace) /etc/sysconfig/network/ifroute-lo %config(noreplace) /etc/ppp/ip-up %config(noreplace) /etc/ppp/ip-down ++++++ 0001-ifup-wireless-no-encryption-option.bnc648830.patch ++++++ >From b1bcb44dfd2cae8ee771ad7988d357e17e692687 Mon Sep 17 00:00:00 2001 From: Vladimir Botka <[email protected]> Date: Wed, 8 Jun 2011 22:00:08 +0200 Subject: [PATCH] no-encryption option added to the WIRELESS_AUTH_MODE (bnc#213001) introduced no-encryption option in Yast, but this option has never been implemented in the sysconfig. The differnece between no-encryption and open is that open system can use user authentication. In both cases key_mgmt=NONE option shall be put into the wpa_supplicant.conf (bnc#648830). Signed-off-by: Marius Tomaschewski <[email protected]> --- scripts/ifup-wireless | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ifup-wireless b/scripts/ifup-wireless index 105ebe9..45f27af 100755 --- a/scripts/ifup-wireless +++ b/scripts/ifup-wireless @@ -304,7 +304,7 @@ EOL # special hack for madwifi test "$DRIVER" = "ath_pci" && run_iw_tool priv authmode 2 ;; - open|opensystem|"") WIRELESS_SEC_MODE="open";; + open|opensystem|no-encryption|"") WIRELESS_SEC_MODE="open";; esac fi if [ -n "$WIRELESS_KEY_0" -a \ @@ -403,7 +403,7 @@ setup_wlanngdev() wlanctl dot11req_mibset mibattribute=dot11ExcludeUnencrypted=true AUTHTYPE=sharedkey ;; - open|opensystem|"") + open|opensystem|no-encryption|"") wlanctl dot11req_mibset mibattribute=dot11ExcludeUnencrypted=false AUTHTYPE=opensystem ;; @@ -540,7 +540,7 @@ print_network_block() print_network_line ssid WIRELESS_ESSID "$SUFFIX" print_network_line_unquoted priority WIRELESS_PRIORITY "$SUFFIX" case "`eval echo \\$WIRELESS_AUTH_MODE$SUFFIX`" in - open) + open|no-encryption) echo " key_mgmt=NONE" for i in 0 1 2 3 ; do KEY="`eval print_key \\"\\$WIRELESS_KEY_$i$SUFFIX\\" \\$WIRELESS_KEY_LENGTH$SUFFIX`" -- 1.7.3.4 ++++++ 0002-do-not-stop-bonding-slaves-first.bnc698478.patch ++++++ >From bea597d39433da54a55f9c95f832aade6852fc9a Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <[email protected]> Date: Tue, 7 Jun 2011 17:18:59 +0200 Subject: [PATCH] Do not return bonding slaves in get_depending_ifaces Fixed get_depending_ifaces to not return bonding slaves by default as it is not required to stop the slaves before the bonding master goes down and in fact it may cause a system hang, when the slaves are infiniband child interfaces, that are deleted while ifdown (bnc#698478). Signed-off-by: Marius Tomaschewski <[email protected]> --- scripts/functions | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/scripts/functions b/scripts/functions index 9bcd575..f3ad06e 100644 --- a/scripts/functions +++ b/scripts/functions @@ -555,14 +555,24 @@ has_link () { # This function looks for interfaces which depend on the given interface. It # prints a list with all depending interfaces. It returns 0 if there are # depending interfaces and !=0 if not. -# Currently it checks only for vlan and bonding interfaces. +# Currently it checks only for vlan and optionally bonding slave interfaces. # FIXME: Add other types of interfaces that depend on others. get_depending_ifaces() { - local VLAN_PATH BOND_PATH DEP_IFACES DEP_VLANS DEP_BONDS BASE_IFACE i + local VLAN_PATH BOND_PATH DEP_VLANS DEP_BONDS BASE_IFACE i + local -a DEP_IFACES=() VLAN_PATH="/proc/net/vlan" - BOND_PATH="/proc/net/bonding" + BOND_PATH="" + while [ $# -gt 0 ]; do + case $1 in + --with-bonding-slaves) + BOND_PATH="/proc/net/bonding" + shift + ;; + -*) shift ;; + *) break ;; + esac + done BASE_IFACE="$1" - DEP_IFACES="" if [ -z "$BASE_IFACE" ]; then return 1 @@ -571,14 +581,14 @@ get_depending_ifaces() { if [ -d "$VLAN_PATH" ]; then DEP_VLANS=`cd "$VLAN_PATH" grep -lws "Device: *$BASE_IFACE" *` - DEP_IFACES="$DEP_VLANS" + DEP_IFACES+=($DEP_VLANS) fi - if [ -d "$BOND_PATH" ]; then + if [ -n "$BOND_PATH" -a -d "$BOND_PATH" ]; then DEP_BONDS=`cd "$BOND_PATH" grep -s '^Slave Interface:' $BASE_IFACE | while IFS=':' read text iface ; do echo -n "$iface" ; done` - DEP_IFACES="$DEP_IFACES${DEP_BONDS:+ $DEP_BONDS}" + DEP_IFACES+=($DEP_BONDS) fi case $BASE_IFACE in @@ -587,18 +597,18 @@ get_depending_ifaces() { for i in `ls -1 /sys/class/net/ 2>/dev/null` ; do test -d /sys/class/net/$i || continue case $i in (${BASE_IFACE}.*) - DEP_IFACES="${DEP_IFACES}${i:+ $i}" + DEP_IFACES+=($i) ;; esac done ;; esac - if [ -z "$DEP_IFACES" ]; then - return 1 - else - echo "$DEP_IFACES" + if [ ${#DEP_IFACES[*]} -gt 0 ]; then + echo "${DEP_IFACES[*]}" return 0 + else + return 1 fi } -- 1.7.3.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
