Hello community, here is the log from the commit of package sysconfig checked in at Sat Jun 3 00:59:56 CEST 2006. -------- --- sysconfig/sysconfig.changes 2006-05-22 22:38:26.000000000 +0200 +++ sysconfig/sysconfig.changes 2006-06-02 16:04:42.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Jun 2 08:24:08 CEST 2006 - zoz@suse.de + +- Changed comment for LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY; now + also rcacpid respects this setting (Bug 180654) +- Set LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=yes only for SLES and + not for SLED (Bug 162970) +- 'ifdown-dhcp all' kills dhcp clients with -9, because interfaces + with STARTMODE=nfsroot must stay up and running. (Bug 176804) +- ifdown calls ifdown-dhcp even if BOOTPROTO=static. We need this to + to stop dhcp client after reconfiguration to static ip address + via YaST (which calls rcnetwork reload). (Bug 179895) +- eliminated two error messages that occur when interface bonding + is activated. (Bug 181129) + +------------------------------------------------------------------- +Tue May 30 12:08:25 CEST 2006 - zoz@suse.de + +- Don't load module 'bonding' multiple times but create and delete + bonding interfaces via sysfs attribute. (Bug 157936) + +------------------------------------------------------------------- @@ -7 +28 @@ - state. [#160916] + state. (Bug 160916) Old: ---- sysconfig-0.50.9-syslog-reload.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.RMkOvA/_old 2006-06-03 00:59:46.000000000 +0200 +++ /var/tmp/diff_new_pack.RMkOvA/_new 2006-06-03 00:59:46.000000000 +0200 @@ -13,7 +13,7 @@ Name: sysconfig BuildRequires: autofs portmap sysfsutils ypbind Version: 0.50.9 -Release: 14 +Release: 15 Summary: The sysconfig scheme Group: System/Base License: GPL @@ -22,7 +22,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk /usr/bin/sed /usr/bin/grep Source: %name-%version.tar.bz2 -Patch: sysconfig-0.50.9-syslog-reload.dif %description This package provides the SuSE system configuration scheme. @@ -42,7 +41,6 @@ %prep %setup -n sysconfig-%{version} -%patch -p1 %build autoreconf --force --install @@ -73,9 +71,6 @@ touch $RPM_BUILD_ROOT/etc/sysconfig/network/config touch $RPM_BUILD_ROOT/etc/sysconfig/network/dhcp touch $RPM_BUILD_ROOT/etc/sysconfig/hardware/config -%if %sles_version >= 10 -sed -i 's/^LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY.*/LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=no/' $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.config-hardware -%endif %files %defattr(-,root,root) @@ -195,6 +190,10 @@ fi # We move all udev helper scripts to /lib/udev sed -i 's#/sbin/rename_netiface#/lib/udev/rename_netiface#' /etc/udev/rules.d/* +# Don't load unsupported modules only on SLES +if grep -qs "Enterprise Server" /etc/SuSE-release; then +sed -i 's/^LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY.*/LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=no/' /var/adm/fillup-templates/sysconfig.config-hardware +fi %{fillup_and_insserv -fY network} %{fillup_only -dns dhcp network network} %{fillup_only -dns config network network} @@ -208,11 +207,26 @@ %{insserv_cleanup} %changelog -n sysconfig +* Fri Jun 02 2006 - zoz@suse.de +- Changed comment for LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY; now + also rcacpid respects this setting (Bug 180654) +- Set LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=yes only for SLES and + not for SLED (Bug 162970) +- 'ifdown-dhcp all' kills dhcp clients with -9, because interfaces + with STARTMODE=nfsroot must stay up and running. (Bug 176804) +- ifdown calls ifdown-dhcp even if BOOTPROTO=static. We need this to + to stop dhcp client after reconfiguration to static ip address + via YaST (which calls rcnetwork reload). (Bug 179895) +- eliminated two error messages that occur when interface bonding + is activated. (Bug 181129) +* Tue May 30 2006 - zoz@suse.de +- Don't load module 'bonding' multiple times but create and delete + bonding interfaces via sysfs attribute. (Bug 157936) * Mon May 22 2006 - poeml@suse.de - fix dhcpcd-hook so that syslog picks up a changed hostname during bootup, by reloading syslog. The reload was already being done during IP address change ("renew state") but not during "up" - state. [#160916] + state. (Bug 160916) * Thu May 18 2006 - zoz@suse.de - rcnetwork: quoted two occurrences $OLDPWD to allow spaces in directory names. (Bug 174029) ++++++ sysconfig-0.50.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/ChangeLog new/sysconfig-0.50.9/ChangeLog --- old/sysconfig-0.50.9/ChangeLog 2006-05-18 20:51:05.000000000 +0200 +++ new/sysconfig-0.50.9/ChangeLog 2006-06-02 14:03:08.000000000 +0200 @@ -1,4 +1,88 @@ ------------------------------------------------------------------------ +r1492 | zoz | 2006-06-02 14:02:32 +0200 (Fr, 02 Jun 2006) | 3 lines +GeÀnderte Pfade: + M /trunk/package/sysconfig.spec.in + +.spec: fixed if expression (for modification of +LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY) + +------------------------------------------------------------------------ +r1491 | zoz | 2006-06-02 13:51:44 +0200 (Fr, 02 Jun 2006) | 3 lines +GeÀnderte Pfade: + M /trunk/package/sysconfig.changes + M /trunk/scripts/functions + M /trunk/scripts/network + +eliminated two error messages that occur when interface bonding +is activated. (Bug 181129) + +------------------------------------------------------------------------ +r1490 | zoz | 2006-06-02 13:43:54 +0200 (Fr, 02 Jun 2006) | 5 lines +GeÀnderte Pfade: + M /trunk/package/sysconfig.changes + M /trunk/scripts/ifup + +ifdown calls ifdown-dhcp even if BOOTPROTO=static. We need this to +to stop dhcp client after reconfiguration to static ip address +via YaST (which calls rcnetwork reload). (Bug 179895) +(reload does not call 'ifdown-dhcp all') + +------------------------------------------------------------------------ +r1489 | zoz | 2006-06-02 11:17:29 +0200 (Fr, 02 Jun 2006) | 3 lines +GeÀnderte Pfade: + M /trunk/package/sysconfig.changes + M /trunk/package/sysconfig.spec.in + +Set LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=yes only for SLES and +not for SLED (Bug 162970) + +------------------------------------------------------------------------ +r1488 | zoz | 2006-06-02 11:01:50 +0200 (Fr, 02 Jun 2006) | 4 lines +GeÀnderte Pfade: + M /trunk/package/sysconfig.changes + M /trunk/scripts/ifup-dhcp + +'ifdown-dhcp all' kills dhcp clients with -9, because interfaces with +STARTMODE=nfsroot must stay up and running. (Bug 176804) + + +------------------------------------------------------------------------ +r1487 | zoz | 2006-06-02 10:30:37 +0200 (Fr, 02 Jun 2006) | 3 lines +GeÀnderte Pfade: + M /trunk/config/hardware/sysconfig.config-hardware + M /trunk/package/sysconfig.changes + +Changed comment for LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY; now also +rcacpid respects this setting (Bug 180654) + +------------------------------------------------------------------------ +r1486 | zoz | 2006-05-30 15:53:22 +0200 (Di, 30 Mai 2006) | 7 lines +GeÀnderte Pfade: + M /trunk/package/sysconfig.changes + M /trunk/scripts/functions + M /trunk/scripts/ifup + +Fixed bug 157936: +- scripts/functions: + + modified load_bond(): Don't load module 'bonding' multiple times but create + and delete bonding interfaces via sysfs attribute. + + added remove_bond(): remove a bonding interface via sysfs +- scripts/ifup: use remove_bond and don't explicitely flush slaves. + +------------------------------------------------------------------------ +r1485 | zoz | 2006-05-25 14:57:38 +0200 (Do, 25 Mai 2006) | 2 lines +GeÀnderte Pfade: + M /trunk/package/sysconfig.changes + +Changelog entry for last patchset + +------------------------------------------------------------------------ +r1484 | poeml | 2006-05-22 18:00:56 +0200 (Mo, 22 Mai 2006) | 1 line +GeÀnderte Pfade: + M /trunk/scripts/dhcpcd-hook + +fix for bug 160916: reload syslog after setting the interface to 'up', so the new hostname is reflected in the logs +------------------------------------------------------------------------ r1483 | zoz | 2006-05-18 20:50:17 +0200 (Do, 18 Mai 2006) | 2 lines GeÀnderte Pfade: M /trunk/package/sysconfig.changes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/config/hardware/sysconfig.config-hardware new/sysconfig-0.50.9/config/hardware/sysconfig.config-hardware --- old/sysconfig-0.50.9/config/hardware/sysconfig.config-hardware 2006-03-10 17:30:59.000000000 +0100 +++ new/sysconfig-0.50.9/config/hardware/sysconfig.config-hardware 2006-06-02 13:51:54.000000000 +0200 @@ -36,8 +36,9 @@ # problem if your kernel is marked as tainted. In this case you firstly have # to avoid loading of unsupported modules. # If you set this variable to no, then no unsupported module will be loaded -# automatically via udev (hotplug), except there is a dedicated configuration -# file for the device. +# automatically via +# - udev (hotplug), except modules from dedicated configuration files +# - rcacpid, except there is a manually written list of modules # Note that there are many other places where modules are loaded which do not # respect this setting. LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=yes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/package/sysconfig.spec.in new/sysconfig-0.50.9/package/sysconfig.spec.in --- old/sysconfig-0.50.9/package/sysconfig.spec.in 2006-03-10 21:08:01.000000000 +0100 +++ new/sysconfig-0.50.9/package/sysconfig.spec.in 2006-06-02 14:02:37.000000000 +0200 @@ -70,9 +70,6 @@ touch $RPM_BUILD_ROOT/etc/sysconfig/network/config touch $RPM_BUILD_ROOT/etc/sysconfig/network/dhcp touch $RPM_BUILD_ROOT/etc/sysconfig/hardware/config -%if %sles_version >= 10 -sed -i 's/^LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY.*/LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=no/' $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.config-hardware -%endif %files %defattr(-,root,root) @@ -192,6 +189,11 @@ fi # We move all udev helper scripts to /lib/udev sed -i 's#/sbin/rename_netiface#/lib/udev/rename_netiface#' /etc/udev/rules.d/* + +# Don't load unsupported modules only on SLES +if grep -qs "Enterprise Server" /etc/SuSE-release; then +sed -i 's/^LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY.*/LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=no/' /var/adm/fillup-templates/sysconfig.config-hardware +fi %{fillup_and_insserv -fY network} %{fillup_only -dns dhcp network network} %{fillup_only -dns config network network} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/scripts/dhcpcd-hook new/sysconfig-0.50.9/scripts/dhcpcd-hook --- old/sysconfig-0.50.9/scripts/dhcpcd-hook 2006-01-13 13:50:25.000000000 +0100 +++ new/sysconfig-0.50.9/scripts/dhcpcd-hook 2006-05-29 13:19:44.000000000 +0200 @@ -19,7 +19,7 @@ # # Author: Peter Poeml <poeml@suse.de> # -# $Id: dhcpcd-hook 1287 2005-09-30 13:30:50Z poeml $ +# $Id: dhcpcd-hook 1484 2006-05-22 16:00:56Z poeml $ # @@ -106,6 +106,9 @@ up) $debug && $log_dbg "Running ifup $INTERFACE -o dhcp" ifup $INTERFACE -o dhcp + + # reload syslog so it knows the new hostname + /etc/init.d/syslog reload ;; down) # We now call PRE_DOWN_SCRIPT directly from ifdown, because it was called diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/scripts/functions new/sysconfig-0.50.9/scripts/functions --- old/sysconfig-0.50.9/scripts/functions 2006-05-18 19:17:59.000000000 +0200 +++ new/sysconfig-0.50.9/scripts/functions 2006-06-02 13:51:54.000000000 +0200 @@ -22,7 +22,7 @@ # Authors: Michal Svec <msvec@suse.cz> # Mads Martin Joergensen <mmj@suse.de> # -# $Id: functions 1481 2006-05-18 17:17:50Z zoz $ +# $Id: functions 1491 2006-06-02 11:51:44Z zoz $ # . /etc/sysconfig/network/scripts/functions.common @@ -146,42 +146,76 @@ 0x${NORM_2:0:2} 0x${NORM_2:2:2} } -# Loads one instance of the module 'bonding' with the name of the interface. +# Loads module 'bonding' if not already loaded. +# Creates a new bonding master interface and sets its options. # Usage: load_bond $INTERFACE $BONDING_MODULE_OPTIONS -# !!! Don't use module option 'max_bonds'. It will break this code !!! -# !!! Use one configuration file per bonding interface !!! +# Module option 'max_bonds' will be ignored. Use one configuration file per +# bonding interface instead. load_bond() { - local IF BIF NIF OPTS - test -z "$1" && return 0 - IF=$1 + local NIF OPT OPT_NAME OPT_VALUE IF=$1 + test -z "$IF" && return 0 shift - OPTS=$* - BIF=`cd /sys/class/net; ls -d bond* 2>/dev/null` - NIF= - if ls /sys/class/net/$IF &>/dev/null; then - return 0 - else - /sbin/modprobe -o $IF bonding $OPTS - for a in `seq 100`; do - for b in `cd /sys/class/net; ls -d bond* 2>/dev/null`; do - for c in $BIF; do - test "$b" = "$c" && continue 2 - done - NIF=$b # "$NIF $b" - break - done - test -n "$NIF" && break - usleep 100000 + if [ -d /sys/class/net/$IF -a ! -d /sys/class/net/$IF/bonding ] ; then + return 1 # Iface exists but of another type + fi + if [ ! -r /sys/class/net/bonding_masters ] ; then + /sbin/modprobe bonding + # If we add module option max_bonds=0 in the modprobe command above then + # we may skip the following lines in this if-fi block. + for a in `seq 33`; do + test -r /sys/class/net/bonding_masters && break + usleep 300000 done - if [ "$NIF" != "$IF" ] ; then + NIF=`cat /sys/class/net/bonding_masters` + if [ -n "$NIF" -a "$NIF" != "$IF" ] ; then nameif -r $IF $NIF fi fi - if ls /sys/class/net/$IF &>/dev/null; then - return 0 - else + if [ ! -d /sys/class/net/$IF/bonding ] ; then + echo "+$IF" > /sys/class/net/bonding_masters + fi + for a in `seq 33`; do + test -d /sys/class/net/$IF/bonding && break + usleep 300000 + done + if [ ! -d /sys/class/net/$IF/bonding ] ; then return 1 fi + # Set options + sleep 1 + for OPT in $*; do + read OPT_NAME OPT_VALUE < <(IFS==; echo $OPT) + if [ "$OPT_NAME" == max_bonds ] ; then + err_mesg "Don't use option max_bonds." + continue + fi + if [ ! -w /sys/class/net/$IF/bonding/$OPT_NAME ] ; then + err_mesg "There is no option '$OPT_NAME' for interface '$IF'." + echo "-$IF" > /sys/class/net/bonding_masters + return 1 # or continue? I guess its better to fail completely + fi + if ! echo "$OPT_VALUE" > /sys/class/net/$IF/bonding/$OPT_NAME ; then + err_mesg "Option '$OPT_NAME' of interface '$IF' cannot be set to" \ + "'$OPT_VALUE'." + echo "-$IF" > /sys/class/net/bonding_masters + return 1 # or continue? I guess its better to fail completely + fi + done + return 0 +} + +# Removes a bonding master interface +# Usage: remove_bond $INTERFACE +remove_bond () { + local IF=$1 + if [ ! -d /sys/class/net/$IF ] ; then + return 0 # Interface does not exist; nothing to do + fi + if [ ! -d /sys/class/net/$IF/bonding ] ; then + return 1 # Interface is not a bonding master + fi + ip link set down dev $1 + echo "-$IF" > /sys/class/net/bonding_masters } get_variable () { @@ -432,13 +466,13 @@ if [ -d "$VLAN_PATH" ]; then DEP_VLANS=`cd "$VLAN_PATH" - grep -lw "Device: *$BASE_IFACE" *` + grep -lws "Device: *$BASE_IFACE" *` DEP_IFACES="$DEP_VLANS" fi if [ -d "$BOND_PATH" ]; then DEP_BONDS=`cd "$BOND_PATH" - grep -lw "Slave Interface: *$BASE_IFACE" *` + grep -lws "Slave Interface: *$BASE_IFACE" *` DEP_IFACES="$DEP_IFACES${DEP_BONDS:+ $DEP_BONDS}" fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/scripts/ifup new/sysconfig-0.50.9/scripts/ifup --- old/sysconfig-0.50.9/scripts/ifup 2006-03-06 16:56:45.000000000 +0100 +++ new/sysconfig-0.50.9/scripts/ifup 2006-06-02 13:51:54.000000000 +0200 @@ -25,7 +25,7 @@ # Bjoern Jacke # Michal Ludvig <mludvig@suse.cz> # -# $Id: ifup 1437 2006-03-02 15:25:38Z zoz $ +# $Id: ifup 1490 2006-06-02 11:43:54Z zoz $ # usage () { @@ -885,6 +885,7 @@ fi if ! load_bond $INTERFACE $BONDING_MODULE_OPTS ; then logerror "Bonding: could not get interface $INTERFACE" + exit $R_NODEV fi fi # Get all slave interfaces from hardware descriptions @@ -1179,15 +1180,13 @@ ifup-route $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} ;; ifdown) + ifdown-dhcp $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} ifdown-route $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} ip addr flush dev $INTERFACE &>/dev/null ip link set dev $INTERFACE down &>/dev/null - # If this is an bonding master, flush slaves + # If this is an bonding master, remove it if [ "$BONDING_MASTER" = yes ] ; then - for BSIFACE in $BSINTERFACES; do - ip addr flush dev $BSIFACE - done - rmmod $INTERFACE + remove_bond $INTERFACE fi retcode=0 # $? ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/scripts/ifup-dhcp new/sysconfig-0.50.9/scripts/ifup-dhcp --- old/sysconfig-0.50.9/scripts/ifup-dhcp 2006-02-14 20:18:29.000000000 +0100 +++ new/sysconfig-0.50.9/scripts/ifup-dhcp 2006-06-02 13:51:54.000000000 +0200 @@ -18,7 +18,7 @@ # Author: Christian Zoz <zoz@suse.de>, 2002-2006 # Peter Poeml <poeml@suse.de>, 2002-2006 # -# $Id: ifup-dhcp 1413 2006-02-14 19:18:24Z zoz $ +# $Id: ifup-dhcp 1488 2006-06-02 09:01:50Z zoz $ # usage () { @@ -430,7 +430,8 @@ ;; esac - test "$INTERFACE" = all && killall $DHCLIENT_BIN &>/dev/null + # We send -9 because interfaces have to stay up for STARTMODE==nfsroot + test "$INTERFACE" = all && killall -9 $DHCLIENT_BIN &>/dev/null # delete primary flag from cache file delete_from_cached_config_data primary yes $INTERFACE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/scripts/network new/sysconfig-0.50.9/scripts/network --- old/sysconfig-0.50.9/scripts/network 2006-05-18 20:50:26.000000000 +0200 +++ new/sysconfig-0.50.9/scripts/network 2006-06-02 13:51:54.000000000 +0200 @@ -21,7 +21,7 @@ # Christian Zoz <zoz@suse.de> # Mads Martin Jørgensen <mmj@suse.de> # -# $Id: network 1483 2006-05-18 18:50:17Z zoz $ +# $Id: network 1491 2006-06-02 11:51:44Z zoz $ # # /etc/init.d/network # @@ -461,6 +461,7 @@ for a in $(type_filter `ls -A /sys/class/net/`); do test "$a" = lo && continue; test "$a" = sit0 && continue; + test "$a" = bonding_masters && continue; test "${a#wifi}" != "$a" && continue case $a in eth*|ath*|wlan*|ra*) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org
participants (1)
-
root@suse.de