Hello community, here is the log from the commit of package sysconfig checked in at Tue Oct 31 16:55:15 CET 2006. -------- --- sysconfig/sysconfig.changes 2006-10-27 16:44:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2006-10-31 16:28:51.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Oct 31 12:04:05 CET 2006 - zoz@suse.de + +- new version 0.60.2 +- rcnetwork: consider also bridge ports as mandatory interfaces and + wait for them (Bug 193216) +- ifcfg-bridge.5: Recommend increasing DHCLIENT_WAIT_AT_BOOT if + BOOTPROTO=dhcp (Bug 193216) +- bonding: + + don't initialize bonding interface a second time (which results + in wrong error messages) when dhcp client calls ifup for POST_UP + stuff. (Bug 190093) + + set interface options twice, because some must be set before and + some after enslaving devices. (Bug 190377) + +------------------------------------------------------------------- Old: ---- sysconfig-0.60.1.tar.bz2 New: ---- sysconfig-0.60.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.K3DgLt/_old 2006-10-31 16:54:58.000000000 +0100 +++ /var/tmp/diff_new_pack.K3DgLt/_new 2006-10-31 16:54:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package sysconfig (Version 0.60.1) +# spec file for package sysconfig (Version 0.60.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: sysconfig BuildRequires: autofs portmap sysfsutils ypbind -Version: 0.60.1 +Version: 0.60.2 Release: 1 Summary: The sysconfig scheme Group: System/Base @@ -208,6 +208,18 @@ %{insserv_cleanup} %changelog -n sysconfig +* Tue Oct 31 2006 - zoz@suse.de +- new version 0.60.2 +- rcnetwork: consider also bridge ports as mandatory interfaces and + wait for them (Bug 193216) +- ifcfg-bridge.5: Recommend increasing DHCLIENT_WAIT_AT_BOOT if + BOOTPROTO=dhcp (Bug 193216) +- bonding: + + don't initialize bonding interface a second time (which results + in wrong error messages) when dhcp client calls ifup for POST_UP + stuff. (Bug 190093) + + set interface options twice, because some must be set before and + some after enslaving devices. (Bug 190377) * Fri Oct 27 2006 - jg@suse.de - new version 0.60.1 - ifup-wireless: using wext driver back-end for madwifi now ++++++ sysconfig-0.60.1.tar.bz2 -> sysconfig-0.60.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.60.1/ChangeLog new/sysconfig-0.60.2/ChangeLog --- old/sysconfig-0.60.1/ChangeLog 2006-10-27 16:24:27.000000000 +0200 +++ new/sysconfig-0.60.2/ChangeLog 2006-10-31 16:27:36.000000000 +0100 @@ -1,4 +1,45 @@ ------------------------------------------------------------------------ +r1515 | zoz | 2006-10-31 16:26:50 +0100 (Di, 31 Okt 2006) | 2 lines +Geänderte Pfade: + M /trunk/VERSION + M /trunk/package/sysconfig.changes + +0.60.2 + +------------------------------------------------------------------------ +r1514 | zoz | 2006-10-31 16:18:52 +0100 (Di, 31 Okt 2006) | 3 lines +Geänderte Pfade: + M /trunk/package/sysconfig.changes + M /trunk/scripts/functions + M /trunk/scripts/ifup + +set interface options twice, because some must be set before and +some after enslaving devices. (Bug 190377) + +------------------------------------------------------------------------ +r1513 | zoz | 2006-10-31 15:41:57 +0100 (Di, 31 Okt 2006) | 5 lines +Geänderte Pfade: + M /trunk/package/sysconfig.changes + M /trunk/scripts/ifup + +don't initialize bonding interface a second time (which results +in wrong error messages) when dhcp client calls ifup for POST_UP +stuff. (Bug 190093) + + +------------------------------------------------------------------------ +r1512 | zoz | 2006-10-31 12:09:03 +0100 (Di, 31 Okt 2006) | 5 lines +Geänderte Pfade: + M /trunk/doc/ifcfg-bridge.5 + M /trunk/package/sysconfig.changes + M /trunk/scripts/functions + +- rcnetwork: consider also bridge ports as mandatory interfaces and + wait for them (Bug 193216) +- ifcfg-bridge.5: Recommend increasing DHCLIENT_WAIT_AT_BOOT if + BOOTPROTO=dhcp (Bug 193216) + +------------------------------------------------------------------------ r1511 | zoz | 2006-10-27 16:23:34 +0200 (Fr, 27 Okt 2006) | 2 lines Geänderte Pfade: M /trunk/VERSION diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.60.1/VERSION new/sysconfig-0.60.2/VERSION --- old/sysconfig-0.60.1/VERSION 2006-10-27 16:23:24.000000000 +0200 +++ new/sysconfig-0.60.2/VERSION 2006-10-31 16:26:50.000000000 +0100 @@ -1 +1 @@ -0.60.1 +0.60.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.60.1/configure new/sysconfig-0.60.2/configure --- old/sysconfig-0.60.1/configure 2006-10-27 16:23:54.000000000 +0200 +++ new/sysconfig-0.60.2/configure 2006-10-31 16:27:03.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.13 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for sysconfig 0.60.1. +# Generated by GNU Autoconf 2.59 for sysconfig 0.60.2. # # Report bugs to <http://www.suse.de/feedback/>. # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='sysconfig' PACKAGE_TARNAME='sysconfig' -PACKAGE_VERSION='0.60.1' -PACKAGE_STRING='sysconfig 0.60.1' +PACKAGE_VERSION='0.60.2' +PACKAGE_STRING='sysconfig 0.60.2' PACKAGE_BUGREPORT='http://www.suse.de/feedback/' ac_unique_file="scripts/ifup" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sysconfig 0.60.1 to adapt to many kinds of systems. +\`configure' configures sysconfig 0.60.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysconfig 0.60.1:";; + short | recursive ) echo "Configuration of sysconfig 0.60.2:";; esac cat <<\_ACEOF @@ -1161,7 +1161,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -sysconfig configure 0.60.1 +sysconfig configure 0.60.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1175,7 +1175,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sysconfig $as_me 0.60.1, which was +It was created by sysconfig $as_me 0.60.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19992,7 +19992,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by sysconfig $as_me 0.60.1, which was +This file was extended by sysconfig $as_me 0.60.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20050,7 +20050,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -sysconfig config.status 0.60.1 +sysconfig config.status 0.60.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.60.1/doc/ifcfg-bridge.5 new/sysconfig-0.60.2/doc/ifcfg-bridge.5 --- old/sysconfig-0.60.1/doc/ifcfg-bridge.5 2005-12-09 08:52:53.000000000 +0100 +++ new/sysconfig-0.60.2/doc/ifcfg-bridge.5 2006-10-31 16:25:43.000000000 +0100 @@ -70,6 +70,13 @@ where it just doesn't make sense, for example when this linux box is the only bridge on the LAN, or when you know that there are no loops in the topology.) +.TP +.B DHCLIENT_WAIT_AT_BOOT <time in seconds> +The scripts wait at least this time for a lease before dhcp client proceeds in +background. It is normally set in the +.I dhcp +configuration file. But since bridges need some time first to initialize it is +recommended to set it to 30 or higher only for this interface. .SH EXAMPLE Minimal example for a bridge interface on eth0 and eth1, the bridge interface itself @@ -82,6 +89,7 @@ BRIDGE='yes' BRIDGE_PORTS='eth0 eth-id-11:de:ad:be:ef:99' BRIDGE_PORTPRIORITIES='50 20' + DHCLIENT_WAIT_AT_BOOT=30 .fi .SH ADDITIONAL INFORMATION diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.60.1/scripts/functions new/sysconfig-0.60.2/scripts/functions --- old/sysconfig-0.60.1/scripts/functions 2006-10-27 16:23:24.000000000 +0200 +++ new/sysconfig-0.60.2/scripts/functions 2006-10-31 16:25:56.000000000 +0100 @@ -22,7 +22,7 @@ # Authors: Michal Svec <msvec@suse.cz> # Mads Martin Joergensen <mmj@suse.de> # -# $Id: functions 1506 2006-10-24 11:48:41Z zoz $ +# $Id: functions 1514 2006-10-31 15:18:52Z zoz $ # . /etc/sysconfig/network/scripts/functions.common @@ -151,8 +151,15 @@ # Usage: load_bond $INTERFACE $BONDING_MODULE_OPTIONS # Module option 'max_bonds' will be ignored. Use one configuration file per # bonding interface instead. +# If first argument is '_no_fail_' then failures in setting interface options +# will not return an error. load_bond() { - local NIF OPT OPT_NAME OPT_VALUE IF=$1 + local NIF OPT OPT_NAME OPT_VALUE OLD_OPT_VALUE OLD_OPT_VALUE_2 IF NOFAIL + if [ "$1" == _no_fail_ ] ; then + NOFAIL=1 + shift + fi + IF=$1 test -z "$IF" && return 0 shift if [ -d /sys/class/net/$IF -a ! -d /sys/class/net/$IF/bonding ] ; then @@ -194,11 +201,31 @@ 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 + # Some options may only be changed if the interface is up and slaves are + # already assigned. Others may only be changed if it is down. To avoid + # unneccessary error messages or warnings we check first if the option + # already has the specified value. + # Special case for option 'mode': this sysfs attribute contains two + # words. A string describing the mode and the corresponding number. We + # have to compare both. + read OLD_OPT_VALUE OLD_OPT_VALUE_2 < /sys/class/net/$IF/bonding/$OPT_NAME + if [ "$OLD_OPT_VALUE" == "$OPT_VALUE" \ + -o \( "$OPT_NAME" == mode -a "$OLD_OPT_VALUE_2" == "$OPT_VALUE" \) \ + ] ; then + info_mesg "Bonding interface '$IF':" \ + "option '$OPT_NAME' is already set to '$OPT_VALUE'" + continue + fi + info_mesg "Bonding interface '$IF':" \ + "Setting option '$OPT_NAME' to '$OPT_VALUE'" + if ! echo "$OPT_VALUE" > /sys/class/net/$IF/bonding/$OPT_NAME \ + 2>/dev/null ; then err_mesg "Option '$OPT_NAME' of interface '$IF' cannot be set to" \ "'$OPT_VALUE'." + # Should we continue? Its better to fail if not requested differently + test "$NOFAIL" == 1 && continue echo "-$IF" > /sys/class/net/bonding_masters - return 1 # or continue? I guess its better to fail completely + return 1 fi done return 0 @@ -234,7 +261,7 @@ get_slaves () { local ret=1 for v in BONDING_SLAVE ETHERDEVICE TUNNEL_DEVICE \ - TUNNEL_LOCAL_INTERFACE; do + TUNNEL_LOCAL_INTERFACE BRIDGE_PORTS; do get_variable $v $1 for vv in `eval echo \$\{\!$v\*\}`; do if [ -n "${!vv}" ] ; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.60.1/scripts/ifup new/sysconfig-0.60.2/scripts/ifup --- old/sysconfig-0.60.1/scripts/ifup 2006-10-27 16:23:24.000000000 +0200 +++ new/sysconfig-0.60.2/scripts/ifup 2006-10-31 16:25:56.000000000 +0100 @@ -25,7 +25,7 @@ # Bjoern Jacke # Michal Ludvig <mludvig@suse.cz> # -# $Id: ifup 1507 2006-10-24 14:16:40Z zoz $ +# $Id: ifup 1514 2006-10-31 15:18:52Z zoz $ # usage () { @@ -890,7 +890,7 @@ # Prepare Bonding # if [ "$BONDING_MASTER" = yes ] ; then - if [ "$SCRIPTNAME" = ifup ] ; then + if [ "$SCRIPTNAME" = ifup -a ! "$DHCP" = yes ] ; then if [ ! -x /sbin/ifenslave ] ; then logerror "Bonding: /sbin/ifenslave not found" exit $R_INTERNAL @@ -931,6 +931,9 @@ "correctly\n$MESSAGE" exit $R_ERROR fi + # Some option have to be changed after ifenslave (e.g. primary) + # Therefore we call load_bond() a second time + load_bond $INTERFACE $BONDING_MODULE_OPTS fi fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org