Hello community,
here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2012-10-27 13:25:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sysconfig (Old)
and /work/SRC/openSUSE:Factory/.sysconfig.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig", Maintainer is "mt@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2012-10-03 10:11:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2012-10-27 13:25:03.000000000 +0200
@@ -1,0 +2,18 @@
+Fri Oct 26 11:28:43 UTC 2012 - mt@suse.com
+
+- version 0.76.6
+- Fixed to check and reject too long interface names or names
+ with suspect characters, do not wait when creation of virtual
+ interface name fails (bnc#784952).
+- Fixed to not report failure while setting unsupported power
+ management option in ifup-wireless as the support and features
+ depends on the driver (bnc#716652).
+- Fixed ifup-dhcp to not start dhcp clients too early or they may
+ be unable to send packets and just increase resend time. Instead,
+ load af_packet module early and wait for link ready (bnc#780644).
+- Fixed netconfig/ntp-runtime to not use try-restart as its start
+ may block for a while, so just add servers ourself. When ntpd is
+ not running (not yet started), the init script will pickup our
+ servers later (bnc#780644).
+
+-------------------------------------------------------------------
Old:
----
sysconfig-0.76.5.tar.bz2
New:
----
sysconfig-0.76.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sysconfig.spec ++++++
--- /var/tmp/diff_new_pack.5Y09Of/_old 2012-10-27 13:25:04.000000000 +0200
+++ /var/tmp/diff_new_pack.5Y09Of/_new 2012-10-27 13:25:04.000000000 +0200
@@ -17,7 +17,7 @@
Name: sysconfig
-Version: 0.76.5
+Version: 0.76.6
Release: 0
Summary: The sysconfig scheme and traditional network scripts
License: GPL-2.0+
++++++ sysconfig-0.76.5.tar.bz2 -> sysconfig-0.76.6.tar.bz2 ++++++
++++ 7230 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.76.5/ChangeLog new/sysconfig-0.76.6/ChangeLog
--- old/sysconfig-0.76.5/ChangeLog 2012-08-09 18:43:08.000000000 +0200
+++ new/sysconfig-0.76.6/ChangeLog 2012-10-26 13:39:19.000000000 +0200
@@ -1,4 +1,83 @@
-commit 24a91302e36c7773ecf4bc29801287452c960640 (HEAD, master)
+commit a964df866b304fcabfc189cc73475080a1b4b4dc (HEAD, tag: version-0.76.6, public/master, origin/master, export/master, master)
+Author: Marius Tomaschewski
+Date: Fri Oct 26 13:32:21 2012 +0200
+
+ version 0.76.6, updated changes file
+
+commit 78ccebbb39d868b19cb6d93203218edcee20d385
+Author: Marius Tomaschewski
+Date: Fri Oct 26 13:20:38 2012 +0200
+
+ Improved NOZEROCONF changes and variable description
+
+commit 9bf0d31b06ffd6632a0b6ca8ba6f1239ec684fe8 (tag: version-0.76.5)
+Author: Mike Latimer
+Date: Thu Sep 27 20:12:07 2012 +0000
+
+ Added support for NOZEROCONF option to disable zero config route.
+
+ version 0.76.5
+
+commit 9bb6f64db086f0364f153ba142b5f3be67ce4baf (opensuse-12.2-update-work)
+Author: Marius Tomaschewski
+Date: Thu Oct 25 16:30:51 2012 +0200
+
+ ifup-wireless: do not fail on unsupported power options
+
+ The power management support differs from driver to driver;
+ complain, but do not forward errors (cause ifup failures)
+ when the specified power operation is not supported ...
+
+commit c10b01dc858da42ec9cec2674a9b57f53a1425b0
+Author: Marius Tomaschewski
+Date: Mon Oct 15 14:12:38 2012 +0200
+
+ ifup: check for valid characters in interface names
+
+commit ab85d0fb76719f3d44cc36e74f5dafa7dc1aacba (sle11-sp2-update-test-work)
+Author: Marius Tomaschewski
+Date: Mon Oct 15 12:27:08 2012 +0200
+
+ network: do not wait for virtuals reporting errors
+
+commit 0ece7834f9e8c495c2238f8089aa942b1b633694
+Author: Marius Tomaschewski
+Date: Mon Oct 15 12:25:06 2012 +0200
+
+ ifup: fail early for too long interface names
+
+commit 6172ff169d3b3b83a7d4b23ac7529dd4f57f88f2
+Author: Marius Tomaschewski
+Date: Wed Sep 26 18:57:09 2012 +0200
+
+ netconfig/ntp-runtime: add servers, do not try-restart
+
+ ntp try-restart picks up the servers we've written, but its
+ start may block for a while, so just add servers ourself.
+ When ntpd is not running (not yet started), the init script
+ will pickup our servers later.
+
+commit 0d47eafa9b5e6743065157d3e4e9a91d6437209f
+Author: Marius Tomaschewski
+Date: Wed Sep 26 17:34:40 2012 +0200
+
+ modprobe af_packet early, before link set up
+
+commit ff57324dc4ad2c80bf06a926861b7aa9864c5db5
+Author: Marius Tomaschewski
+Date: Wed Sep 26 17:28:35 2012 +0200
+
+ Added DHCLIENT_WAIT_LINK variable instead to hardcode
+
+ Changed to use DHCLIENT_WAIT_AT_BOOT/2 sec.
+
+commit 80a5f487e79f6b2ea1aa5cf01018a1f948614433
+Author: Marius Tomaschewski
+Date: Wed Sep 26 17:08:51 2012 +0200
+
+ Use dhclient -v when debug is enabled (bnc#780644)
+
+commit 24a91302e36c7773ecf4bc29801287452c960640 (tag: version-0.76.4, opensuse-12.2-update, opensuse-12.2)
Author: Marius Tomaschewski
Date: Thu Aug 9 16:42:02 2012 +0000
@@ -16,7 +95,7 @@
Check before running a script in netcontrol_services
-commit 91e448a1b2aad14d90e55d32f34a4f79ece703f0 (origin/master)
+commit 91e448a1b2aad14d90e55d32f34a4f79ece703f0
Author: Marius Tomaschewski
Date: Fri Jul 20 16:49:34 2012 +0200
@@ -30,7 +109,7 @@
Intel has confirmed that uas is a hopeless case (bnc#770301)
-commit d0875c64365b90868f26dbb77ba0fdc1562624ce (public/master, export/master)
+commit d0875c64365b90868f26dbb77ba0fdc1562624ce
Author: Marius Tomaschewski
Date: Fri Jul 20 14:15:32 2012 +0200
@@ -339,7 +418,7 @@
Updated changes file
-commit 578a4f46906883e376ec36261bdaee4e823421da (master-nm_online_timeout2)
+commit 578a4f46906883e376ec36261bdaee4e823421da
Author: Marius Tomaschewski
Date: Mon Oct 10 13:13:49 2011 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.76.5/VERSION new/sysconfig-0.76.6/VERSION
--- old/sysconfig-0.76.5/VERSION 2012-08-09 18:41:48.000000000 +0200
+++ new/sysconfig-0.76.6/VERSION 2012-10-26 13:28:34.000000000 +0200
@@ -1 +1 @@
-0.76.4
+0.76.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.76.5/config/sysconfig.config-network new/sysconfig-0.76.6/config/sysconfig.config-network
--- old/sysconfig-0.76.5/config/sysconfig.config-network 2012-09-27 22:06:14.000000000 +0200
+++ new/sysconfig-0.76.6/config/sysconfig.config-network 2012-10-26 13:19:26.000000000 +0200
@@ -181,10 +181,20 @@
# should get started when network interfaces are started.
FIREWALL="yes"
+## Type: yesno
+## Default: no
+#
+# This variable is used to disable the Zero Configuration Networking
+# (zeroconf) route (169.254.0.0) on local interfaces, which match
+# the pattern in LINKLOCAL_INTERFACES variable.
+#
+NOZEROCONF="no"
+
## Type: string
## Default: "eth*[0-9]|tr*[0-9]|wlan[0-9]|ath[0-9]"
#
-# Automatically add a linklocal route to the matching interfaces.
+# When is not disabled using the NOZEROCONF variable, automatically
+# add a IPv4 linklocal route to the matching interfaces.
# This string is used in a bash "case" statement, so it may contain
# '*', '[', ']' and '|' meta-characters.
#
@@ -392,11 +402,3 @@
#
WIRELESS_REGULATORY_DOMAIN=''
-## Type: yesno
-## Default: no
-#
-# This variable is used to disable the Zero Configuration Networking
-# (zeroconf) route (169.254.0.0) on local interfaces.
-#
-NOZEROCONF='no'
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.76.5/config/sysconfig.dhcp-network new/sysconfig-0.76.6/config/sysconfig.dhcp-network
--- old/sysconfig-0.76.5/config/sysconfig.dhcp-network 2012-07-20 14:01:42.000000000 +0200
+++ new/sysconfig-0.76.6/config/sysconfig.dhcp-network 2012-10-26 12:58:03.000000000 +0200
@@ -258,11 +258,24 @@
#
DHCLIENT6_RELEASE_BEFORE_QUIT="no"
+## Type: integer
+## Default: ""
+#
+# Before ifup-dhcp is going to start dhcp clients, it will set up the link
+# when needed. Then it has to wait until the link is ready. This setting
+# allows to specify the time how long to wait. Default is half of the time
+# in the DHCLIENT_WAIT_AT_BOOT variable.
+#
+DHCLIENT_WAIT_LINK=""
+
## Type: integer
## Default: 0
#
-# Some interfaces need time to initialize. Add the latency time in seconds
-# so these can be handled properly. Should probably set per interface rather than here.
+# Some interfaces need time to initialize and/or do not report correct status.
+# Add the latency time in seconds so these can be handled properly. Should
+# probably set per interface rather than here.
+# This setting causes a sleep time before dhcp clients are started regardless
+# of the link status (wait time in DHCLIENT_WAIT_LINK).
#
DHCLIENT_SLEEP="0"
@@ -271,7 +284,9 @@
#
# When the DHCP client is started at boot time, the boot process will stop
# until the interface is successfully configured, but at most for
-# DHCLIENT_WAIT_AT_BOOT seconds.
+# DHCLIENT_WAIT_AT_BOOT seconds. Do not set this variable higher than the
+# WAIT_FOR_INTERFACES variable -- it is adjusted to WAIT_FOR_INTERFACES/2
+# as default.
#
# Note: RFC 2131 specifies, that the dhcp client should wait a random time
# between one and ten seconds to desynchronize the use of DHCP at startup.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.76.5/missing new/sysconfig-0.76.6/missing
--- old/sysconfig-0.76.5/missing 2012-08-09 18:43:01.000000000 +0200
+++ new/sysconfig-0.76.6/missing 2012-10-26 13:38:25.000000000 +0200
@@ -1,10 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.18; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -26,7 +25,7 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
@@ -34,7 +33,7 @@
sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-# In the cases where this matters, `missing' is being run in the
+# In the cases where this matters, 'missing' is being run in the
# srcdir already.
if test -f configure.ac; then
configure_ac=configure.ac
@@ -65,7 +64,7 @@
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
error status if there is no known handling for PROGRAM.
Options:
@@ -74,21 +73,20 @@
--run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
+ aclocal touch file 'aclocal.m4'
+ autoconf touch file 'configure'
+ autoheader touch file 'config.h.in'
autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
+ automake touch all 'Makefile.in' files
+ bison create 'y.tab.[ch]', if possible, from existing .[ch]
+ flex create 'lex.yy.c', if possible, from existing .c
help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
+ lex create 'lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ yacc create 'y.tab.[ch]', if possible, from existing .[ch]
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to ."
exit $?
@@ -100,8 +98,8 @@
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: Unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
@@ -122,22 +120,13 @@
# Not GNU programs, they don't have --version.
;;
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
# Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
+ # running '$TOOL --version' or '$TOOL --help' to check whether
# $TOOL exists and not knowing $TOOL uses missing.
exit 1
fi
@@ -149,27 +138,27 @@
case $program in
aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
+WARNING: '$1' is $msg. You should only need it if
+ you modified 'acinclude.m4' or '${configure_ac}'. You might want
+ to install the Automake and Perl packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
autoconf*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+WARNING: '$1' is $msg. You should only need it if
+ you modified '${configure_ac}'. You might want to install the
+ Autoconf and GNU m4 packages. Grab them from any GNU
archive site."
touch configure
;;
autoheader*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
+WARNING: '$1' is $msg. You should only need it if
+ you modified 'acconfig.h' or '${configure_ac}'. You might want
+ to install the Autoconf and GNU m4 packages. Grab them
from any GNU archive site."
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
@@ -186,9 +175,9 @@
automake*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
+WARNING: '$1' is $msg. You should only need it if
+ you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
+ You might want to install the Automake and Perl packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
sed 's/\.am$/.in/' |
@@ -197,10 +186,10 @@
autom4te*)
echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
+WARNING: '$1' is needed, but is $msg.
You might have modified some files without having the
proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
+ You can get '$1' as part of Autoconf from any GNU
archive site."
file=`echo "$*" | sed -n "$sed_output"`
@@ -220,13 +209,13 @@
bison*|yacc*)
echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
+WARNING: '$1' $msg. You should only need it if
+ you modified a '.y' file. You may need the Bison package
in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
+ Bison from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -250,13 +239,13 @@
lex*|flex*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
+WARNING: '$1' is $msg. You should only need it if
+ you modified a '.l' file. You may need the Flex package
in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
+ Flex from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -273,10 +262,10 @@
help2man*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: '$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
+ Help2man package in order for those modifications to take
+ effect. You can get Help2man from any GNU archive site."
file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
@@ -291,12 +280,12 @@
makeinfo*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
+WARNING: '$1' is $msg. You should only need it if
+ you modified a '.texi' or '.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
+ call might also be the consequence of using a buggy 'make' (AIX,
+ DU, IRIX). You might want to install the Texinfo package or
+ the GNU make package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
@@ -318,49 +307,14 @@
touch $file
;;
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
+WARNING: '$1' is needed, and is $msg.
You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
+ proper tools for further handling them. Check the 'README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
+ some other package would contain this missing '$1' program."
exit 1
;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.76.5/scripts/functions new/sysconfig-0.76.6/scripts/functions
--- old/sysconfig-0.76.5/scripts/functions 2012-07-20 14:01:42.000000000 +0200
+++ new/sysconfig-0.76.6/scripts/functions 2012-10-26 12:58:03.000000000 +0200
@@ -94,6 +94,14 @@
test -f $NETWORK_RUNFILE
}
+is_valid_interface_name()
+{
+ local LANG=C LC_ALL=C
+ local INTERFACE="$1"
+ local IFNAME_RX='^[[:alnum:]._:-]{1,15}$'
+ [[ ${INTERFACE} =~ ${IFNAME_RX} ]]
+}
+
# returns 0 if ifup is currently working on this interface
ifup_on_iface() {
ps axhww | grep -qs "[i]fup.* $INTERFACE\>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.76.5/scripts/ifup new/sysconfig-0.76.6/scripts/ifup
--- old/sysconfig-0.76.5/scripts/ifup 2012-07-20 14:01:42.000000000 +0200
+++ new/sysconfig-0.76.6/scripts/ifup 2012-10-26 12:58:03.000000000 +0200
@@ -139,12 +139,21 @@
# Get a configuration name
if [ -z "$CONFIG" ] ; then
- read CONFIG < <(read_cached_config_data config $INTERFACE)
+ read CONFIG < <(read_cached_config_data config "$INTERFACE")
fi
if [ -z "$CONFIG" ] ; then
CONFIG=$INTERFACE
fi
+# Check valid interface name length and content
+if [ ${#INTERFACE} -gt 15 ] ; then
+ message "`printf " %-9s: interface name too long" "$INTERFACE"`"
+ exit $R_ERROR
+elif ! is_valid_interface_name "$INTERFACE" ; then
+ message "`printf " %-9s: invalid interface name" "$INTERFACE"`"
+ exit $R_ERROR
+fi
+
case $SCRIPTNAME in
ifprobe)
IFUPFILE=$RUN_FILES_BASE/ifup-$INTERFACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.76.5/scripts/ifup-dhcp new/sysconfig-0.76.6/scripts/ifup-dhcp
--- old/sysconfig-0.76.5/scripts/ifup-dhcp 2012-07-20 14:01:42.000000000 +0200
+++ new/sysconfig-0.76.6/scripts/ifup-dhcp 2012-10-26 12:58:03.000000000 +0200
@@ -362,7 +362,7 @@
# don't write copyright info
local args="-q"
- test "$DHCLIENT_DEBUG" = "yes" && args=""
+ test "$DHCLIENT_DEBUG" = "yes" && args="-v"
# send hostname for DDNS?
case "$DHCLIENT_HOSTNAME_OPTION" in
@@ -423,7 +423,7 @@
# don't write copyright info
local args="-q"
- test "$DHCLIENT6_DEBUG" = "yes" && args=""
+ test "$DHCLIENT6_DEBUG" = "yes" && args="-v"
# send hostname for DDNS?
case "$DHCLIENT6_HOSTNAME_OPTION" in
@@ -687,6 +687,12 @@
write_cached_config_data hostname "`hostname 2>/dev/null`" $INTERFACE
commit_cached_config_data $INTERFACE
+ # make sure linux packet filter is ready before we set
+ # the interface up. Otherwise some dhcp packets may be
+ # never sent (or dhcp does not get any response?) until
+ # both the link + af_packet are ready to use.
+ /sbin/modprobe af_packet
+
debug "Activating interface $INTERFACE"
if ! is_iface_up $INTERFACE ; then
@@ -694,7 +700,9 @@
${LLADDR:+address $LLADDR} $LINK_OPTIONS
# wait a bit or dhclient(6) may produce false send errors
- link_ready_wait "$INTERFACE" 3
+ # or dhcp4 may sent its first packets before link is ready,
+ # increase the resent time and all needs a while longer...
+ link_ready_wait "$INTERFACE" ${DHCLIENT_WAIT_LINK:-$((${DHCLIENT_WAIT_AT_BOOT:-15}/2))}
# (optionally) wait until a device is really configured
sleep ${DHCLIENT_SLEEP:-0}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.76.5/scripts/ifup-route new/sysconfig-0.76.6/scripts/ifup-route
--- old/sysconfig-0.76.5/scripts/ifup-route 2012-09-27 22:07:16.000000000 +0200
+++ new/sysconfig-0.76.6/scripts/ifup-route 2012-10-26 13:18:43.000000000 +0200
@@ -142,12 +142,12 @@
#
EXTRALINKLOCAL=
islinklocal=
-if test -n "$LINKLOCAL_INTERFACES" ; then
+if test "$NOZEROCONF" != "yes" -a -n "$LINKLOCAL_INTERFACES" ; then
eval "case \$INTERFACE in $LINKLOCAL_INTERFACES) islinklocal=true ;; esac"
fi
# Calling 'ip' if there is no interface (ifdown called from udev for remove
# event) would trigger automatic module loading (Bug 199456)
-if [ -d /sys/class/net/$INTERFACE -a "$NOZEROCONF" != "yes" ] ; then
+if [ -d /sys/class/net/$INTERFACE -a "$NOZEROCONF" != "yes" -a -n "$islinklocal" ] ; then
# Don't add this route if interface has no v4 address (Bug 65557)
test -z "`ip -4 a l dev $INTERFACE 2>/dev/null`" && islinklocal=
if test -n "$islinklocal" ; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.76.5/scripts/ifup-wireless new/sysconfig-0.76.6/scripts/ifup-wireless
--- old/sysconfig-0.76.5/scripts/ifup-wireless 2012-07-20 14:01:42.000000000 +0200
+++ new/sysconfig-0.76.6/scripts/ifup-wireless 2012-10-26 12:58:03.000000000 +0200
@@ -783,20 +783,22 @@
""|none) ;;
yes) run_iw_tool config power period 2
if [ $RETVAL -eq 250 ]; then
- # The power operation is invalid or unsupported.
+ # The power operations may be not supported by the
+ # driver and not all driver support all modes ...
iwconfig $INTERFACE power off 2> /dev/null
- # If the power operation is unsupported, ignore the error.
- [ $? -eq 250 ] && RETVAL=$R_SUCCESS
+ # Error were logged/displayed ... don't fail here.
+ RETVAL=$R_SUCCESS
fi ;;
no|off) run_iw_tool config power off
# If the power operation is unsupported, ignore the error.
[ $RETVAL -eq 250 ] && RETVAL=$R_SUCCESS ;;
*) run_iw_tool config power $WIRELESS_POWER
if [ $RETVAL -eq 250 ]; then
- # The power operation is invalid or unsupported.
+ # The power operations may be not supported by the
+ # driver and not all driver support all modes ...
iwconfig $INTERFACE power off 2> /dev/null
- # If the power operation is unsupported, ignore the error.
- [ $? -eq 250 ] && RETVAL=$R_SUCCESS
+ # Error were logged/displayed ... don't fail here.
+ RETVAL=$R_SUCCESS
fi ;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.76.5/scripts/netconfig.d/ntp-runtime new/sysconfig-0.76.6/scripts/netconfig.d/ntp-runtime
--- old/sysconfig-0.76.5/scripts/netconfig.d/ntp-runtime 2012-07-20 14:01:42.000000000 +0200
+++ new/sysconfig-0.76.6/scripts/netconfig.d/ntp-runtime 2012-10-26 12:58:03.000000000 +0200
@@ -231,10 +231,25 @@
# here we should restart services if needed
-# try restart ntp; reload is not supported and we need
-# to delete old servers
-if [ -x $r/etc/init.d/ntp ]; then
- $r/etc/init.d/ntp try-restart >/dev/null 2>&1
+#
+# do not restart or it may (will) block ifup
+# just try to add the server at runtime ...
+#
+NTP_CONF="/etc/ntp.conf"
+NTPDC_BIN="/usr/sbin/ntpdc"
+
+if [ -n "${NTP_SERVER_LIST[*]}" -a -f "${NTP_CONF}" ] && /etc/init.d/ntp status >/dev/null 2>/dev/null ; then
+ NTP_KEYS=$(awk '/^keys/ { print $2 }' $NTP_CONF)
+ NTP_KEYID=$(awk '/^requestkey[[:blank:]]/ { print $2 }' $NTP_CONF)
+ NTP_PASSWD=$(test -n "$NTP_KEYS" -a -n "$NTP_KEYID" -a -r "$NTP_KEYS" && awk '$0 ~ key { print $3 }' key="^[[:blank:]]*$NTP_KEYID[[:blank:]]" $NTP_KEYS)
+
+ if [ -n "$NTP_KEYS" -a -n "$NTP_PASSWD" ] ; then
+ for server in ${NTP_SERVER_LIST[*]} ; do
+ NTPDC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\naddserver $server\n"
+ NTPDC_LOG=$(echo -e "${NTPDC_CMD}quit" | $NTPDC_BIN)
+ debug "$PROGNAME add-server: $server"
+ done
+ fi
fi
exit 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.76.5/scripts/network new/sysconfig-0.76.6/scripts/network
--- old/sysconfig-0.76.5/scripts/network 2012-07-20 14:01:52.000000000 +0200
+++ new/sysconfig-0.76.6/scripts/network 2012-10-26 12:58:03.000000000 +0200
@@ -925,6 +925,7 @@
done
debug ... final
+ debug FAILED_IFACES=''
debug SUCCESS_IFACES=$SUCCESS_IFACES
debug MANDATORY_DEVICES=$MANDATORY_DEVICES
debug FAILED=$FAILED
@@ -950,6 +951,7 @@
echo
;;
$R_NOCONFIG)
+ FAILED_IFACES="$FAILED_IFACES $IFACE"
rc_failed 6
rc_status -v1
# : $((FAILED++))
@@ -960,6 +962,7 @@
rc_status -v1
;;
*)
+ FAILED_IFACES="$FAILED_IFACES $IFACE"
rc_failed 7
rc_status -v1
# : $((FAILED++))
@@ -981,6 +984,9 @@
for S in $SUCCESS_IFACES; do
test "$IFACE" = "$S" && continue 2
done
+ for F in $FAILED_IFACES ; do
+ test "$IFACE" = "$F" && continue 2
+ done
IFACE="`type_filter $IFACE`"
test -z "$IFACE" && continue
status -m $IFACE &>/dev/null
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.76.5/sysconfig.spec new/sysconfig-0.76.6/sysconfig.spec
--- old/sysconfig-0.76.5/sysconfig.spec 2012-08-09 18:43:04.000000000 +0200
+++ new/sysconfig-0.76.6/sysconfig.spec 2012-10-26 13:38:28.000000000 +0200
@@ -18,7 +18,7 @@
Name: sysconfig
-Version: 0.76.4
+Version: 0.76.6
Release: 0
Summary: The sysconfig scheme and traditional network scripts
License: GPL-2.0+
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org