Hello community,
here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2012-11-02 17:43:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-27 13:25:03.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2012-11-02 17:43:07.000000000 +0100
@@ -1,0 +2,13 @@
+Thu Nov 1 17:08:25 UTC 2012 - mt@suse.com
+
+- version 0.76.7
+- Start ifup pre/post and if-up.d/if-down.d scripts in background.
+ The new network/config variable WAIT_BACKGROUND_JOBS specifies
+ the wait limit. Default is 5 secons, 0 disables backgrounding
+ and reverts to previous blocking behavior. Attempt to solve the
+ issues where interfaces are not come up in time, because some
+ hook-script are blocking ifup (bnc#780644).
+- Execute netconfig/ntp-runtime updates in background (bnc#780644).
+- Man-page hint to use STARTMODE=nfsroot when using iSCSI or FCoE.
+
+-------------------------------------------------------------------
Old:
----
sysconfig-0.76.6.tar.bz2
New:
----
sysconfig-0.76.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sysconfig.spec ++++++
--- /var/tmp/diff_new_pack.vUg29I/_old 2012-11-02 17:43:10.000000000 +0100
+++ /var/tmp/diff_new_pack.vUg29I/_new 2012-11-02 17:43:10.000000000 +0100
@@ -17,7 +17,7 @@
Name: sysconfig
-Version: 0.76.6
+Version: 0.76.7
Release: 0
Summary: The sysconfig scheme and traditional network scripts
License: GPL-2.0+
++++++ sysconfig-0.76.6.tar.bz2 -> sysconfig-0.76.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/ChangeLog new/sysconfig-0.76.7/ChangeLog
--- old/sysconfig-0.76.6/ChangeLog 2012-10-26 13:39:19.000000000 +0200
+++ new/sysconfig-0.76.7/ChangeLog 2012-11-01 18:22:06.000000000 +0100
@@ -1,4 +1,33 @@
-commit a964df866b304fcabfc189cc73475080a1b4b4dc (HEAD, tag: version-0.76.6, public/master, origin/master, export/master, master)
+commit fbdfff3aaa236a7909b03981bf6d6db0b0cd48c5 (HEAD, master-jobs, master)
+Author: Marius Tomaschewski
+Date: Thu Nov 1 18:17:37 2012 +0100
+
+ version 0.76.7, updated changes file
+
+commit ba4f43c796427a7749504d23969a2340789571f2
+Author: Marius Tomaschewski
+Date: Thu Nov 1 17:54:45 2012 +0100
+
+ Execute netconfig/ntp-runtime update in background
+
+commit 52964539fa72a820a7d390cac577861d41f17f3e
+Author: Marius Tomaschewski
+Date: Thu Nov 1 17:54:00 2012 +0100
+
+ Background ifup pre/post and if-up.d/if-down.d scripts
+
+ New network/config variable WAIT_BACKGROUND_JOBS with a
+ default of 5 secs wait limit. A WAIT_BACKGROUND_JOBS=0
+ disables a parallel/background hook script execution.
+
+commit 2f25f2e046af65db2056b009da181eec31e9d1cd (public/master, origin/master, export/master)
+Merge: a964df8 95976ed
+Author: Marius Tomaschewski
+Date: Fri Oct 26 14:08:36 2012 +0200
+
+ Merge commit 'refs/merge-requests/1' of git://gitorious.org/opensuse/sysconfig
+
+commit a964df866b304fcabfc189cc73475080a1b4b4dc (tag: version-0.76.6)
Author: Marius Tomaschewski
Date: Fri Oct 26 13:32:21 2012 +0200
@@ -18,7 +47,7 @@
version 0.76.5
-commit 9bb6f64db086f0364f153ba142b5f3be67ce4baf (opensuse-12.2-update-work)
+commit 9bb6f64db086f0364f153ba142b5f3be67ce4baf
Author: Marius Tomaschewski
Date: Thu Oct 25 16:30:51 2012 +0200
@@ -77,7 +106,19 @@
Use dhclient -v when debug is enabled (bnc#780644)
-commit 24a91302e36c7773ecf4bc29801287452c960640 (tag: version-0.76.4, opensuse-12.2-update, opensuse-12.2)
+commit 95976edae8503a0f61308628aed1b176fc09fd9f
+Author: Gregor Dschung
+Date: Tue Sep 11 15:24:45 2012 +0200
+
+ Hint to use STARTMODE=nfsroot when using iSCSI or FCoE
+
+commit 3a9dd29ab9a56cefd7b6f1cf83cac60c40e7d682
+Author: Gregor Dschung
+Date: Tue Sep 11 15:11:55 2012 +0200
+
+ Hint to use STARTMODE=nfsroot when using iSCSI
+
+commit 24a91302e36c7773ecf4bc29801287452c960640 (tag: version-0.76.4, tag: opensuse-12.2-release, public/opensuse-12.2, origin/opensuse-12.2, export/opensuse-12.2, opensuse-12.2)
Author: Marius Tomaschewski
Date: Thu Aug 9 16:42:02 2012 +0000
@@ -412,7 +453,7 @@
- add libtool as buildrequire to avoid implicit dependency
- Updated package/sysconfig.changes file
-commit 9c61279efc7787953b2fdfe38be9802e0310292c (public/opensuse-12.1, origin/opensuse-12.1, export/opensuse-12.1, opensuse-12.1)
+commit 9c61279efc7787953b2fdfe38be9802e0310292c (tag: opensuse-12.1-release)
Author: Marius Tomaschewski
Date: Fri Oct 21 14:27:53 2011 +0200
@@ -1973,7 +2014,7 @@
git-svn-id: https://svn.suse.de/svn/sysconfig/trunk@1980 bf393798-0adf-0310-9952-bd479070b6c1
-commit e61f37a520adc1f4d1569b645d9d960f3e4c68e9 (tag: opensuse-11.2-final)
+commit e61f37a520adc1f4d1569b645d9d960f3e4c68e9
Author: mt
Date: Fri Oct 9 13:39:58 2009 +0000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/VERSION new/sysconfig-0.76.7/VERSION
--- old/sysconfig-0.76.6/VERSION 2012-10-26 13:28:34.000000000 +0200
+++ new/sysconfig-0.76.7/VERSION 2012-11-01 18:21:39.000000000 +0100
@@ -1 +1 @@
-0.76.6
+0.76.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/config/ifcfg.template new/sysconfig-0.76.7/config/ifcfg.template
--- old/sysconfig-0.76.6/config/ifcfg.template 2012-10-18 11:31:09.000000000 +0200
+++ new/sysconfig-0.76.7/config/ifcfg.template 2012-11-01 17:37:49.000000000 +0100
@@ -18,7 +18,8 @@
# IFPLUGD_PRIORITY.)
# - nfsroot: Nearly like 'auto'. But interfaces with this startmode will never
# be shut down via 'rcnetwork stop'. 'ifdown <iface>' still works.
-# Use this when you have a nfs root filesystem.
+# Use this when you have a nfs root filesystem or you connect to an
+# iSCSI / FCoE target.
# - manual: start it only when ifup is called manually
# - off: will not be started at all
# - onboot: alias for auto, deprecated, only for backward compliance
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/config/sysconfig.config-network new/sysconfig-0.76.7/config/sysconfig.config-network
--- old/sysconfig-0.76.6/config/sysconfig.config-network 2012-10-26 13:19:26.000000000 +0200
+++ new/sysconfig-0.76.7/config/sysconfig.config-network 2012-11-01 18:21:39.000000000 +0100
@@ -22,6 +22,16 @@
GLOBAL_POST_UP_EXEC="yes"
GLOBAL_PRE_DOWN_EXEC="yes"
+## Type: integer
+### Default: 5
+##
+## Specifies the number of seconds ifup(8)/ifdown(8) should wait for the
+## PRE/POST, if-up.d/if-down.d scripts, executed in parallel then.
+## A setting of 0 disables the background execution (reverts to previous
+## blocking behavior).
+##
+WAIT_BACKGROUND_JOBS=5
+
## Type: yesno
## Default: no
# If ifup should check if an ip address is already in use, set this to yes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/configure new/sysconfig-0.76.7/configure
--- old/sysconfig-0.76.6/configure 2012-10-26 13:38:24.000000000 +0200
+++ new/sysconfig-0.76.7/configure 2012-11-01 18:21:56.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.76.6.
+# Generated by GNU Autoconf 2.69 for sysconfig 0.76.7.
#
# 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.76.6'
-PACKAGE_STRING='sysconfig 0.76.6'
+PACKAGE_VERSION='0.76.7'
+PACKAGE_STRING='sysconfig 0.76.7'
PACKAGE_BUGREPORT='http://www.suse.de/feedback/'
PACKAGE_URL=''
@@ -1320,7 +1320,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.76.6 to adapt to many kinds of systems.
+\`configure' configures sysconfig 0.76.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1390,7 +1390,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sysconfig 0.76.6:";;
+ short | recursive ) echo "Configuration of sysconfig 0.76.7:";;
esac
cat <<\_ACEOF
@@ -1494,7 +1494,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sysconfig configure 0.76.6
+sysconfig configure 0.76.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1863,7 +1863,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.76.6, which was
+It was created by sysconfig $as_me 0.76.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2691,7 +2691,7 @@
# Define the identity of the package.
PACKAGE='sysconfig'
- VERSION='0.76.6'
+ VERSION='0.76.7'
cat >>confdefs.h <<_ACEOF
@@ -12161,7 +12161,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.76.6, which was
+This file was extended by sysconfig $as_me 0.76.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12218,7 +12218,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.76.6
+sysconfig config.status 0.76.7
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.76.6/scripts/functions new/sysconfig-0.76.7/scripts/functions
--- old/sysconfig-0.76.6/scripts/functions 2012-10-26 12:58:03.000000000 +0200
+++ new/sysconfig-0.76.7/scripts/functions 2012-11-01 18:21:39.000000000 +0100
@@ -81,6 +81,20 @@
eval "$v='${l[@]}'"
}
+wait_jobs()
+{
+ local -i wsecs=$1
+ local -i uwait=25000
+ local -i loops=$(((wsecs * 1000000) / $uwait))
+ local -i loop=0
+ local -a jpids=($(jobs -pr))
+ while (( ${#jpids[@]} > 0 && loop++ < loops)) ; do
+ usleep $uwait
+ jpids=($(jobs -pr))
+ done
+ return ${#jpids[@]}
+}
+
nm_running () {
local MSG RET
test -x "$NETWORKMANAGER_BIN" || return
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/scripts/ifup new/sysconfig-0.76.7/scripts/ifup
--- old/sysconfig-0.76.6/scripts/ifup 2012-10-26 12:58:03.000000000 +0200
+++ new/sysconfig-0.76.7/scripts/ifup 2012-11-01 18:21:39.000000000 +0100
@@ -688,7 +688,11 @@
# ignore backup files and leftovers from rpm
echo $SCRIPT | grep -q '\(\.rpm\(save\|new\)$\)\|\(.~$\)' && continue;
debug "executing additional global stop script $SCRIPT"
- $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then
+ $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} &
+ else
+ $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ fi
done
fi
@@ -698,9 +702,16 @@
for SCRIPT in `eval echo $PRE_DOWN_SCRIPT scripts/$PRE_DOWN_SCRIPT`; do
if [ -x "$SCRIPT" -a ! -d "$SCRIPT" ] ; then
debug "executing additional stop script $SCRIPT"
- $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then
+ $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} &
+ else
+ $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ fi
fi
done
+ if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then
+ wait_jobs ${WAIT_BACKGROUND_JOBS:-0} || disown -a
+ fi
# shut down depending services first
scripts/${SCRIPTNAME}-services $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
@@ -715,9 +726,16 @@
for SCRIPT in `eval echo $PRE_UP_SCRIPT scripts/$PRE_UP_SCRIPT`; do
if [ -x "$SCRIPT" -a ! -d "$SCRIPT" ] ; then
debug "executing additional start script $SCRIPT"
- $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then
+ $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} &
+ else
+ $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ fi
fi
done
+ if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then
+ wait_jobs ${WAIT_BACKGROUND_JOBS:-0} || disown -a
+ fi
fi
fi
@@ -1397,7 +1415,11 @@
# ignore backup files and leftovers from rpm
echo $SCRIPT | grep -q '\(\.rpm\(save\|new\)$\)\|\(.~$\)' && continue;
debug "executing additional global start script $SCRIPT"
- $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then
+ $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} &
+ else
+ $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ fi
done
fi
@@ -1407,10 +1429,16 @@
for SCRIPT in `eval echo $POST_UP_SCRIPT scripts/$POST_UP_SCRIPT`; do
if [ -x "$SCRIPT" -a ! -d "$SCRIPT" ] ; then
debug "executing additional start script $SCRIPT"
- $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then
+ $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} &
+ else
+ $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ fi
fi
done
-
+ if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then
+ wait_jobs ${WAIT_BACKGROUND_JOBS:-0} || disown -a
+ fi
fi
# execute an individual poststop script if available
@@ -1421,9 +1449,16 @@
for SCRIPT in `eval echo $POST_DOWN_SCRIPT scripts/$POST_DOWN_SCRIPT`; do
if [ -x "$SCRIPT" -a ! -d "$SCRIPT" ] ; then
debug "executing additional stop script $SCRIPT"
- $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then
+ $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} &
+ else
+ $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ fi
fi
done
+ if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then
+ wait_jobs ${WAIT_BACKGROUND_JOBS:-0} || disown -a
+ fi
fi
# We have to respect the status of ifplugd for interfaces with
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/scripts/netconfig.d/ntp-runtime new/sysconfig-0.76.7/scripts/netconfig.d/ntp-runtime
--- old/sysconfig-0.76.6/scripts/netconfig.d/ntp-runtime 2012-10-26 12:58:03.000000000 +0200
+++ new/sysconfig-0.76.7/scripts/netconfig.d/ntp-runtime 2012-11-01 18:21:39.000000000 +0100
@@ -231,26 +231,36 @@
# here we should restart services if needed
-#
-# 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
+do_runtime_update()
+{
+ #
+ # 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 2>/dev/null)
+ NTP_KEYID=$(awk -- '/^requestkey[[:blank:]]/ { print $2 }' $NTP_CONF 2>/dev/null)
+ 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 2>/dev/null)
+
+ 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
-fi
+}
+
+# runtime update always in background
+( do_runtime_update & )
+disown -a
exit 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/sysconfig.spec new/sysconfig-0.76.7/sysconfig.spec
--- old/sysconfig-0.76.6/sysconfig.spec 2012-10-26 13:38:28.000000000 +0200
+++ new/sysconfig-0.76.7/sysconfig.spec 2012-11-01 18:22:00.000000000 +0100
@@ -18,7 +18,7 @@
Name: sysconfig
-Version: 0.76.6
+Version: 0.76.7
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