Hello community, here is the log from the commit of package sysconfig for openSUSE:12.3 checked in at 2013-01-31 14:54:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/sysconfig (Old) and /work/SRC/openSUSE:12.3/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.3/sysconfig/sysconfig.changes 2013-01-31 01:39:09.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.sysconfig.new/sysconfig.changes 2013-01-31 14:54:58.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Jan 31 10:46:51 UTC 2013 - [email protected] + +- version 0.80.4 +- Fixed to use a suffix in ETHTOOL_OPTIONS variable to allow to + apply every setting (e.g. 'gro off lro off') separately, as the + ethtool utility stops at first failure and the NIC driver may + reject settings when the link is not up or they're unsupported. + Further, added ETHTOOL_UP_RETRY and ETHTOOL_UP_WAIT variables + to optionally wait after the link has been set up and retry to + set the ETHTOOL_OPTIONS*. Updated ifcfg(5) man page (bnc#787744) + [0002-Allow-ETHTOOL_OPTIONS-SUFFIX-variables-bnc-787744.patch, + 0003-Documented-ETHTOOL_OPTIONS-SUFFIX-variables-bnc-787744.patch] +- Applied 81-mount.rules fix by Robert Milasan to not mount file + systems with the noauto flag set (bnc#798641, [SWAMPID 50702]). + [0001-Do-not-mount-file-system-with-noauto-flag-bnc-798641.patch] + +------------------------------------------------------------------- Old: ---- sysconfig-0.80.3.tar.bz2 New: ---- sysconfig-0.80.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.EDv4Lv/_old 2013-01-31 14:54:58.000000000 +0100 +++ /var/tmp/diff_new_pack.EDv4Lv/_new 2013-01-31 14:54:58.000000000 +0100 @@ -17,7 +17,7 @@ Name: sysconfig -Version: 0.80.3 +Version: 0.80.4 Release: 0 Summary: The sysconfig scheme and traditional network scripts License: GPL-2.0+ ++++++ sysconfig-0.80.3.tar.bz2 -> sysconfig-0.80.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.3/ChangeLog new/sysconfig-0.80.4/ChangeLog --- old/sysconfig-0.80.3/ChangeLog 2013-01-28 14:56:11.000000000 +0100 +++ new/sysconfig-0.80.4/ChangeLog 2013-01-31 11:49:43.000000000 +0100 @@ -1,10 +1,46 @@ -commit 4aeb72eac38a2afd785b1d0d8511a02588111eb9 (HEAD, master) +commit d3a88730e9a2675b1c6119a13adb951069fc2508 (HEAD, origin/master, master) +Author: Marius Tomaschewski <[email protected]> +Date: Thu Jan 31 11:47:43 2013 +0100 + + version 0.80.4, updated changes file + +commit 693842b04c46f92539b45e2c9e198ce68eb65a35 +Author: Marius Tomaschewski <[email protected]> +Date: Wed Jan 30 16:51:16 2013 +0100 + + Documented ETHTOOL_OPTIONS[SUFFIX] variables (bnc#787744) + +commit 4617ff49a59989232f7e903340d1cef2e5a941e4 +Author: Marius Tomaschewski <[email protected]> +Date: Wed Jan 30 15:37:15 2013 +0100 + + Allow ETHTOOL_OPTIONS[SUFFIX] variables (bnc#787744) + + Allow ETHTOOL_OPTIONS[SUFFIX] variables allowing to apply + each setting separately as ethtool returns on first error. + Also added ETHTOOL_UP_REPEAT and ETHTOOL_UP_WAIT allowing + to repeat the attempt to set the ethtool settings as some + NIC drives reject settings when the link is not yet up. + +commit 913cc1013a492b02f2eff0d9f6ddf82c9d8ea259 +Author: Robert Milasan <[email protected]> +Date: Sat Jan 26 11:08:12 2013 +0000 + + Do not mount file system with noauto flag (bnc#798641) + + Fix for 81-mount.rules to not mount file systems with + the noauto flag set. + + Signed-off-by: Hannes Reinecke <[email protected]> + Signed-off-by: Marius Tomaschewski <[email protected]> + +commit 4aeb72eac38a2afd785b1d0d8511a02588111eb9 Author: Marius Tomaschewski <[email protected]> Date: Mon Jan 28 14:55:39 2013 +0100 updated changes file, version 0.80.3 -commit aa74d3fb276cd6064cde526847799575dc76ec64 (origin/master) +commit aa74d3fb276cd6064cde526847799575dc76ec64 Author: Marius Tomaschewski <[email protected]> Date: Fri Jan 25 18:25:54 2013 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.3/VERSION new/sysconfig-0.80.4/VERSION --- old/sysconfig-0.80.3/VERSION 2013-01-28 14:54:44.000000000 +0100 +++ new/sysconfig-0.80.4/VERSION 2013-01-31 11:48:29.000000000 +0100 @@ -1 +1 @@ -0.80.3 +0.80.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.3/config/hardware/81-mount.rules new/sysconfig-0.80.4/config/hardware/81-mount.rules --- old/sysconfig-0.80.3/config/hardware/81-mount.rules 2013-01-23 10:25:50.000000000 +0100 +++ new/sysconfig-0.80.4/config/hardware/81-mount.rules 2013-01-31 11:48:29.000000000 +0100 @@ -5,9 +5,9 @@ ACTION=="add", SUBSYSTEM=="block", KERNEL=="md*", GOTO="skip_mount" # don't handle crypto devices, boot.crypto does that already (bnc#569942) ACTION=="change", SUBSYSTEM=="block", KERNEL=="dm-*", ENV{DM_TARGET_TYPES}=="crypt", GOTO="skip_mount" -ACTION=="add|change", SUBSYSTEM=="block", ENV{FSTAB_OPTS}=="*nofail*", IMPORT{program}="udevmountd" +ACTION=="add|change", SUBSYSTEM=="block", ENV{FSTAB_OPTS}=="*nofail*", ENV{FSTAB_OPTS}!="*noauto*", IMPORT{program}="udevmountd" ACTION=="add|change", ENV{FSCK_STATE}=="unknown|clean", RUN+="udevmountd add" -ACTION=="remove", ENV{FSTAB_OPTS}=="*nofail*", RUN+="udevmountd remove" +ACTION=="remove", ENV{FSTAB_OPTS}=="*nofail*", ENV{FSTAB_OPTS}!="*noauto*", RUN+="udevmountd remove" LABEL="skip_mount" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.3/configure new/sysconfig-0.80.4/configure --- old/sysconfig-0.80.3/configure 2013-01-28 14:56:01.000000000 +0100 +++ new/sysconfig-0.80.4/configure 2013-01-31 11:48:38.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.69 for sysconfig 0.80.3. +# Generated by GNU Autoconf 2.69 for sysconfig 0.80.4. # # Report bugs to <http://www.suse.de/feedback/>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='sysconfig' PACKAGE_TARNAME='sysconfig' -PACKAGE_VERSION='0.80.3' -PACKAGE_STRING='sysconfig 0.80.3' +PACKAGE_VERSION='0.80.4' +PACKAGE_STRING='sysconfig 0.80.4' PACKAGE_BUGREPORT='http://www.suse.de/feedback/' PACKAGE_URL='' @@ -1322,7 +1322,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.80.3 to adapt to many kinds of systems. +\`configure' configures sysconfig 0.80.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1392,7 +1392,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysconfig 0.80.3:";; + short | recursive ) echo "Configuration of sysconfig 0.80.4:";; esac cat <<\_ACEOF @@ -1497,7 +1497,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysconfig configure 0.80.3 +sysconfig configure 0.80.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1866,7 +1866,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.80.3, which was +It was created by sysconfig $as_me 0.80.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2694,7 +2694,7 @@ # Define the identity of the package. PACKAGE='sysconfig' - VERSION='0.80.3' + VERSION='0.80.4' cat >>confdefs.h <<_ACEOF @@ -12174,7 +12174,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sysconfig $as_me 0.80.3, which was +This file was extended by sysconfig $as_me 0.80.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12231,7 +12231,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sysconfig config.status 0.80.3 +sysconfig config.status 0.80.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.3/doc/ifcfg.5 new/sysconfig-0.80.4/doc/ifcfg.5 --- old/sysconfig-0.80.3/doc/ifcfg.5 2013-01-23 10:25:50.000000000 +0100 +++ new/sysconfig-0.80.4/doc/ifcfg.5 2013-01-31 11:48:29.000000000 +0100 @@ -249,7 +249,7 @@ from system or config. Please always open a bug report when it is required to set the type. .TP -.B ETHTOOL_OPTIONS +.B ETHTOOL_OPTIONS [ \fIsuffix\fR ] If this variable is not empty ifup will call ethtool with this options. See the .B ethtool (8) @@ -257,6 +257,27 @@ If the option string starts with a '-' (e.g. '-K iface rx on'), then the second word in the string will be replaced with the current interface name. Otherwise (e.g. 'autoneg off speed 10') ifup prepends '-s <interface>'. +The optional variable suffix can be used to apply every setting separately, +e.g.: + + ETHTOOL_OPTIONS='autoneg off speed 10' + ETHTOOL_OPTIONS_gro='-K iface gro off' + ETHTOOL_OPTIONS_lro='-K iface lro off' + +The \fBethtool (8)\fR utility stops applying the settings at first failure +and may not apply remaining settings. The NIC driver may reject settings +as not supported (e.g. '-K iface lro off') or also when the link is not up. +.TP +.BR ETHTOOL_WAIT\ <seconds> +When not empty, it causes to wait specified number of seconds before starting +to apply ETHTOOL_OPTIONS (driver initialization time). +.TP +.BR ETHTOOL_UP_REPEAT\ { no* | yes } +Repeat the attempt to set the ETHTOOL_OPTIONS after the link is up. +.TP +.BR ETHTOOL_UP_WAIT\ <seconds> +When not empty, it causes to wait specified number of seconds before starting +to repeat to apply ETHTOOL_OPTIONS after the link has been set up. .TP .BR RUN_POLL_TCPIP\ { yes* | no } Controls running diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.3/scripts/functions new/sysconfig-0.80.4/scripts/functions --- old/sysconfig-0.80.3/scripts/functions 2013-01-23 20:41:39.000000000 +0100 +++ new/sysconfig-0.80.4/scripts/functions 2013-01-31 11:48:29.000000000 +0100 @@ -1342,3 +1342,64 @@ fi } + +_set_ethtool_options() +{ + local iface=$1 + local ethtool=$2 + local options=$3 + local ret out option xifacex settings + + test "x$options" = "x" && return 0 + test "x$iface" = "x" -o "x$ethtool" = "x" && return 1 + + case $options in + -*) # got an option, replace second word with current interface name + read option xifacex settings < <(echo "$options") + options="$option $iface $settings" + ;; + *) # old style, setting a parameter... + options="-s $iface $options" + ;; + esac + + out=`$ethtool $options 2>&1` + ret=$? + if test $ret -eq 0 ; then + info_mesg "$ethtool $options${out:+: $out}" + else + err_mesg "Error while executing '$ethtool $options': [$ret] $out" + fi + return $ret +} + +set_ethtool_options() +{ + local iface=${1:-$INTERFACE} + local tool var + + test "x$iface" = x && return 1 + for tool in /sbin/ethtool /usr/sbin/ethtool ; do + test -x "$tool" && break || unset tool + done + + for var in ${!ETHTOOL_OPTIONS*} ; do + test "x${!var}" = "x" && continue + if test -z "$tool" ; then + err_mesg "ethtool is not installed" + return 1 + fi + _set_ethtool_options "$iface" "$tool" "${!var}" + done + return 0 +} + +have_ethtool_options() +{ + local var + for var in ${!ETHTOOL_OPTIONS*} ; do + test "x${!var}" = "x" || return 0 + done + return 1 +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.3/scripts/ifup new/sysconfig-0.80.4/scripts/ifup --- old/sysconfig-0.80.3/scripts/ifup 2013-01-23 20:41:39.000000000 +0100 +++ new/sysconfig-0.80.4/scripts/ifup 2013-01-31 11:48:29.000000000 +0100 @@ -835,36 +835,11 @@ ###################################################################### # Change device settings via ethtool. # -if [ "$SCRIPTNAME" = ifup -a -n "$ETHTOOL_OPTIONS" ]; then +if [ "$SCRIPTNAME" = ifup ] && have_ethtool_options ; then # There were cases where interfaces were not ready for ethtool # immediately after registration. test -n "$ETHTOOL_WAIT" && sleep $ETHTOOL_WAIT 2>/dev/null - case "$ETHTOOL_OPTIONS" in - -*) # got an option, replace second word with current interface name - read ETHTOOL_SWITCH xifacex ETHTOOL_SETTINGS < <(echo $ETHTOOL_OPTIONS) - ETHTOOL_OPTIONS="$ETHTOOL_SWITCH $INTERFACE $ETHTOOL_SETTINGS" - ;; - *) # old style, setting a parameter... - ETHTOOL_OPTIONS="-s $INTERFACE $ETHTOOL_OPTIONS" - ;; - esac - - RETCODE=1 - ETHTOOL=/sbin/ethtool - for tool in $ETHTOOL /usr$ETHTOOL ; do - [ -x "$tool" ] || continue - ETHTOOL=$tool ; RETCODE=0 - done - if test $RETCODE != 0 ; then - MESSAGE="ethtool is not installed" - else - MESSAGE="`$ETHTOOL $ETHTOOL_OPTIONS 2>&1`" - RETCODE=$? - fi - test $RETCODE != 0 \ - && err_mesg "Error while executing: $ethtool $ETHTOOL_OPTIONS" \ - || info_mesg "$ethtool $ETHTOOL_OPTIONS" - test -n "$MESSAGE" && err_mesg "$MESSAGE" + set_ethtool_options "$INTERFACE" fi @@ -1026,6 +1001,15 @@ logerror "Cannot enable interface $INTERFACE." retcode=$R_NOTRUNNING else + if test "$ETHTOOL_UP_REPEAT" = "yes" && \ + have_ethtool_options ; then + + test -n "$ETHTOOL_UP_WAIT" && \ + sleep $ETHTOOL_UP_WAIT 2>/dev/null + + set_ethtool_options "$INTERFACE" + fi + if [ -n "$MTU" ] ; then ip link set $INTERFACE mtu $MTU || retcode_mtu=$? if [ $retcode_mtu != 0 ] ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.3/sysconfig.spec new/sysconfig-0.80.4/sysconfig.spec --- old/sysconfig-0.80.3/sysconfig.spec 2013-01-28 14:56:04.000000000 +0100 +++ new/sysconfig-0.80.4/sysconfig.spec 2013-01-31 11:48:42.000000000 +0100 @@ -18,7 +18,7 @@ Name: sysconfig -Version: 0.80.3 +Version: 0.80.4 Release: 0 Summary: The sysconfig scheme and traditional network scripts License: GPL-2.0+ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
