Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2013-05-16 16:24:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysconfig (Old) and /work/SRC/openSUSE:Factory/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig" Changes: -------- --- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2013-03-05 06:50:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2013-05-16 16:24:59.000000000 +0200 @@ -1,0 +2,45 @@ +Thu May 16 09:01:58 UTC 2013 - [email protected] + +- version 0.80.6 +- Merged changes from $OBS/Base:System/sysconfig and SLE-11-SP3. +- Fixed to set link settings on bonding slaves while enslave. + Before enslaving a new slave, apply link settings like the MAC + address or MTU to the slave as required e.g. for fail_over_mac + active, where the bonding interface is using the MAC of the + currently active slave (bnc#815025). + [0002-Set-link-settings-on-bonding-slaves-while-enslave.patch] +- Fixed to stop dhcp clients and remove IP addresses on not yet + enslaved bridge ports and bonding slaves. The bridge or bond + interface has the IP addresses assigned itself instead. + The port/slave may still have IP addresses, when the IP config + of an active (ethernet) interface has been moved into a bridge + or bond config, e.g. while "virsh iface-bridge eth0 br0". There + is no full ifdown for the port interface to not break the vlans + (and their bridges) which may refer to the port too (bnc#813148). + [0001-Flush-IPs-on-bridge-bond-children-ifup-bnc-813148.patch] + +------------------------------------------------------------------- +Thu May 16 08:02:23 UTC 2013 - [email protected] + +- Add forgotten patch sysconfig-0.80.5.patch + +------------------------------------------------------------------- +Tue May 7 10:12:04 UTC 2013 - [email protected] + +- Accommodate poll.tcpip to systemd + +------------------------------------------------------------------- +Wed Mar 20 09:44:26 UTC 2013 - [email protected] + +- Fixed to wait for dhcp/ipv6 under systemd again. + Fixed regression caused by bnc#785240, bnc#780644 fixes to not + discard the dhcp/ipv6 dupplicate address detection in progress + error codes under systemd completely, but wait until dhcp/ipv6 + dad finished or the WAIT_FOR_INTERFACES timeout is reached and + then discard in the status returned to systemd (bnc#808718). + It caused failures of other services trying to bind tentative + IPv6 addresses, e.g. in mixed dhcp4 / static IPv6 setups. + Thanks to Rolf Eike Beer for the report/tests/debug outputs. + [0001-Fixed-to-wait-for-dhcp-ipv6-under-systemd-again.patch] + +------------------------------------------------------------------- Old: ---- sysconfig-0.80.5.tar.bz2 New: ---- sysconfig-0.80.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.8zS1by/_old 2013-05-16 16:24:59.000000000 +0200 +++ /var/tmp/diff_new_pack.8zS1by/_new 2013-05-16 16:24:59.000000000 +0200 @@ -17,7 +17,7 @@ Name: sysconfig -Version: 0.80.5 +Version: 0.80.6 Release: 0 Summary: The sysconfig scheme and traditional network scripts License: GPL-2.0+ ++++++ sysconfig-0.80.5.tar.bz2 -> sysconfig-0.80.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.5/ChangeLog new/sysconfig-0.80.6/ChangeLog --- old/sysconfig-0.80.5/ChangeLog 2013-02-22 09:28:07.000000000 +0100 +++ new/sysconfig-0.80.6/ChangeLog 2013-05-16 11:04:55.000000000 +0200 @@ -1,4 +1,87 @@ -commit 4b058026fc4ab0709d5fad75200bdc3a638a9499 (HEAD, opensuse-12.3-wip-4, opensuse-12.3, master) +commit 1799837010e66a8c59e678afeae93f5d62ce702f (HEAD, tag: version-0.80.6, origin/master, master) +Author: Marius Tomaschewski <[email protected]> +Date: Thu May 16 11:02:26 2013 +0200 + + version 0.80.6, updated changes file [bnc#813148] + +commit e71f14c93d1ee6475cb4323ccba524b0bb788013 +Author: Marius Tomaschewski <[email protected]> +Date: Thu Apr 4 09:51:29 2013 +0200 + + Flush IPs on bridge/bond children ifup (bnc#813148) + + Bonding slaves and bridge ports should not have any IP addresses + (the bridge or bond has to hold them instead), so remove them + before enslaving them. + This usually happens when the IP config of an active (ethernet) + interface has been moved into a bridge/bond config, e.g. while + "virsh iface-bridge eth0 br0". + There is no full ifdown for the port interface to not break the + vlans (and their bridges) which may refer to the port too. + +commit a6872f6116c1a77141f0fef2d66f3a12aca59675 +Author: Marius Tomaschewski <[email protected]> +Date: Thu May 16 10:42:32 2013 +0200 + + version 0.80.6, updated changes file + +commit 845de3acb076333092f256a14ed0c23ea1abcd88 +Author: Marius Tomaschewski <[email protected]> +Date: Thu May 16 10:40:37 2013 +0200 + + Merged changes from $OBS/Base:System/sysconfig + +commit 1b2fe5450541eaf8e370389be7ff8dfcb558207f +Author: Dr. Werner Fink <[email protected]> +Date: Tue May 7 10:12:04 2013 +0000 + + Accommodate poll.tcpip to systemd + +commit 4dbf9441f4ddf0e06efb580a14983a3446976a20 +Author: Marius Tomaschewski <[email protected]> +Date: Mon Apr 22 14:28:24 2013 +0200 + + Set link settings on bonding slaves while enslave + + Before enslaving a new slave, apply link settings like the MAC address + or MTU to the slave as required e.g. for fail_over_mac=active, where + the bonding interface is using the MAC of the currently active slave + (bnc#815025). + +commit 865c699a6dc85ff9d73ccf9159d7ae6f02530011 (origin/opensuse-12.3, opensuse-12.3-test, opensuse-12.3) +Author: Marius Tomaschewski <[email protected]> +Date: Thu Apr 4 12:49:28 2013 +0200 + + Updated sysconfig.changes + +commit a73d8a1a9d89da5571fe0dedd773760f0159eb33 +Author: Marius Tomaschewski <[email protected]> +Date: Tue Mar 19 20:28:40 2013 +0100 + + Fixed to wait for dhcp/ipv6 under systemd again + + Fixed regression caused by bnc#785240, bnc#780644 fixes to not + discard the dhcp/ipv6 dupplicate address detection in progress + error codes under systemd completely, but wait until dhcp/ipv6 + dad finished or the WAIT_FOR_INTERFACES timeout is reached and + then discard in the status returned to systemd (bnc#808718). + It caused failures of other services trying to bind tentative + IPv6 addresses, e.g. in mixed dhcp4 / static IPv6 setups. + Thanks to Rolf Eike Beer for the report/tests/debug outputs. + +commit cb5adb5e7b198b534d8960cbec0bf845535fdba7 +Author: Marius Tomaschewski <[email protected]> +Date: Thu Mar 7 18:11:44 2013 +0100 + + Updated changes file + +commit 6f6c53a21d75bd05e48d897ee1cb4233bb1396c2 +Author: Marius Tomaschewski <[email protected]> +Date: Mon Mar 4 14:40:02 2013 +0000 + + Fixed to create migration marker directory (bnc#806989) + +commit 4b058026fc4ab0709d5fad75200bdc3a638a9499 (sle12-wip-0, sle12-master) Author: Marius Tomaschewski <[email protected]> Date: Fri Feb 22 09:20:23 2013 +0100 @@ -16,7 +99,7 @@ /etc/init.d/network script) on NETWORKMANAGER=yes until NM has been installed and enabled as network.service (bnc#803058). -commit d3a88730e9a2675b1c6119a13adb951069fc2508 (origin/master, master-12) +commit d3a88730e9a2675b1c6119a13adb951069fc2508 Author: Marius Tomaschewski <[email protected]> Date: Thu Jan 31 11:47:43 2013 +0100 @@ -64,7 +147,7 @@ rcnetwork: reworked suspend/resume hooks -commit 9d8d4b9238d0adcce1528cdc3b4a220d67e33ec4 (master-work-10) +commit 9d8d4b9238d0adcce1528cdc3b4a220d67e33ec4 Author: Marius Tomaschewski <[email protected]> Date: Thu Jan 24 19:59:34 2013 +0100 @@ -76,7 +159,7 @@ rcnetwork: handle also partial -o type|skip options -commit 1dd0f91bf396a91b5dffce54290f97fbe6b353ee (master-work-9) +commit 1dd0f91bf396a91b5dffce54290f97fbe6b353ee Author: Marius Tomaschewski <[email protected]> Date: Wed Jan 23 18:39:33 2013 +0100 @@ -132,7 +215,7 @@ The dhcp6_client state variable were set to dhclient while the config variable DHCLIENT6_BIN is using dhclient6 here. -commit 5e85eaf907dc16ff75a317591e7ff0172d4b8e44 (tag: version-0.80.0, origin/opensuse-12.3-wip) +commit 5e85eaf907dc16ff75a317591e7ff0172d4b8e44 (tag: version-0.80.0) Author: Marius Tomaschewski <[email protected]> Date: Tue Jan 15 12:26:53 2013 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.5/Makefile.in new/sysconfig-0.80.6/Makefile.in --- old/sysconfig-0.80.5/Makefile.in 2013-02-22 09:27:55.000000000 +0100 +++ new/sysconfig-0.80.6/Makefile.in 2013-05-16 11:04:37.000000000 +0200 @@ -599,7 +599,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) + chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.5/VERSION new/sysconfig-0.80.6/VERSION --- old/sysconfig-0.80.5/VERSION 2013-02-22 09:27:34.000000000 +0100 +++ new/sysconfig-0.80.6/VERSION 2013-05-16 10:41:12.000000000 +0200 @@ -1 +1 @@ -0.80.5 +0.80.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.5/configure new/sysconfig-0.80.6/configure --- old/sysconfig-0.80.5/configure 2013-02-22 09:27:54.000000000 +0100 +++ new/sysconfig-0.80.6/configure 2013-05-16 11:04:36.000000000 +0200 @@ -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.5. +# Generated by GNU Autoconf 2.69 for sysconfig 0.80.6. # # 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.5' -PACKAGE_STRING='sysconfig 0.80.5' +PACKAGE_VERSION='0.80.6' +PACKAGE_STRING='sysconfig 0.80.6' 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.5 to adapt to many kinds of systems. +\`configure' configures sysconfig 0.80.6 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.5:";; + short | recursive ) echo "Configuration of sysconfig 0.80.6:";; 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.5 +sysconfig configure 0.80.6 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.5, which was +It was created by sysconfig $as_me 0.80.6, 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.5' + VERSION='0.80.6' 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.5, which was +This file was extended by sysconfig $as_me 0.80.6, 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.5 +sysconfig config.status 0.80.6 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.5/doc/ifcfg-bonding.5 new/sysconfig-0.80.6/doc/ifcfg-bonding.5 --- old/sysconfig-0.80.5/doc/ifcfg-bonding.5 2013-01-31 11:48:29.000000000 +0100 +++ new/sysconfig-0.80.6/doc/ifcfg-bonding.5 2013-05-16 10:35:17.000000000 +0200 @@ -30,9 +30,10 @@ Note also: Bonding slave interfaces are reserved for the bonding and are not usable for any another purposes (unlike e.g. interfaces used for VLANs) and the bonding master manages the slaves itself, e.g. it sets the MAC address -on the slaves. To configure this accordingly, set BOOTPROTO=none in the ifcfg -file of each slave interfaces to avoids any link-layer or IP setup on these -interfaces. +on the slaves by default. To configure this accordingly, set BOOTPROTO=none +in the ifcfg file of each slave interfaces to avoid any IP or link-layer +setup on these interfaces. The bonding script will apply the link settings +(e.g. for fail_over_mode=active) at enslave time. .TP .B BONDING_MODULE_OPTS contains bonding options. Here you can set interface timeouts or working modes @@ -81,6 +82,15 @@ #ETHTOOL_OPTIONS='wol g' .fi +\fBNote\fR, that the slaves are configured with BOOTPROTO='none', what avoids +link set UP and IP configuration of the slaves. Further also STARTMODE='hotplug', +allowing that some (all) of the slaves are allowed to be missed at boot time. +The hotplug slaves will be added to the bond as soon as are become available +(udev BUS based persistent name rule or manual ifup bond0 is required). +The network script waits for the slaves, but when there is no slave available +at bonding start time (boot time), the bonding creation will fail and also +the network script will report an error. + .SH Additional Information For additional and more general information take a look into diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.5/doc/ifcfg.5 new/sysconfig-0.80.6/doc/ifcfg.5 --- old/sysconfig-0.80.5/doc/ifcfg.5 2013-02-22 09:14:14.000000000 +0100 +++ new/sysconfig-0.80.6/doc/ifcfg.5 2013-05-16 10:35:17.000000000 +0200 @@ -137,10 +137,11 @@ .br .B none .br -For bonding slaves and bridge ports to skip the interface configuration. -It is also recommended (instead of static) for interfaces configured with -STARTMODE=nfsroot (for nfs- and iscsi-root installation), where the setup -is done in the initrd and inconsistencies could break it. +For bonding slaves, to skip the link-layer (MTU, MAC address) setup and IP +configuration of the interface in ifup. The bonding script handles the link +layer settings itself at enslave time. See also ifcfg-bonding(5) man page. +Note: Do not use to just skip the IP setup -- use BOOTPROTO="static" +without any addresses in the IPADDR variables (or routes) instead. .TP .br .B ibft diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.5/scripts/functions new/sysconfig-0.80.6/scripts/functions --- old/sysconfig-0.80.5/scripts/functions 2013-02-22 09:14:14.000000000 +0100 +++ new/sysconfig-0.80.6/scripts/functions 2013-05-16 10:55:06.000000000 +0200 @@ -924,6 +924,33 @@ done < <(ls -1d /etc/sysconfig/network/ifcfg-* 2>/dev/null) } +get_bridge_parent () { + local IF="$1" + test "x$IF" = "x" && return 1 + + local a bridge port + while IFS=- read a bridge; do + case $bridge in + ""|*~|*.old|*.rpmnew|*.rpmsave|*.scpmbackup) + continue + ;; + esac + + local BRIDGE + get_variable BRIDGE "$bridge" + test "$BRIDGE" = yes || continue + + unset BRIDGE_PORTS + get_variable BRIDGE_PORTS "$bridge" + for port in $BRIDGE_PORTS ; do + if test "x$IF" = "x${port}" ; then + echo "$bridge" + return 0 + fi + done + done < <(ls -1d /etc/sysconfig/network/ifcfg-* 2>/dev/null) +} + # This function looks for interfaces which depend on the given interface. It # prints a list with all depending interfaces. It returns 0 if there are # depending interfaces and !=0 if not. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.5/scripts/ifup new/sysconfig-0.80.6/scripts/ifup --- old/sysconfig-0.80.5/scripts/ifup 2013-02-22 09:14:14.000000000 +0100 +++ new/sysconfig-0.80.6/scripts/ifup 2013-05-16 10:55:06.000000000 +0200 @@ -901,6 +901,40 @@ fi fi +###################################################################### +# Make sure to explicitly remove IP addresses and stop dhcp clients, +# ... (when started) on ifup of bridge ports and bonding slaves. +# +if test "$SCRIPTNAME$SKIP_MAIN_PART" = "ifup" \ + -a "$STARTMODE" != "nfsroot" ; then + bond=`get_bonding_master "$INTERFACE"` + bridge=`get_bridge_parent "$INTERFACE"` + if test "x$bond" != "x" -o "x$bridge" != "x" ; then + ifdown-dhcp $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + ifdown-route $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + ifdown-autoip $CONFIG $INTERFACE -o prepare $OPTIONS + # Call down before flush to not reset ipv6 sysctls. + if [ -d /sys/class/net/$INTERFACE -a \ + ! -d /sys/class/net/$INTERFACE/master -a \ + ! -d /sys/class/net/$INTERFACE/brport ] ; then + ip link set dev $INTERFACE down &>/dev/null + ip -4 addr flush dev $INTERFACE &>/dev/null + ip -6 addr flush dev $INTERFACE &>/dev/null + fi + # Handle broken port/slaves bootproto configurations + case $BOOTPROTO in + ""|static|none|ibft) ;; + *) + if test "x$bond" != "x" ; then + BOOTPROTO="none" + else + BOOTPROTO="static" + fi + ;; + esac + fi +fi + dhcpretcode=$R_SUCCESS # switch type. If SKIP_MAIN_PART == skip, don't execute any section case "$BOOTPROTO$SKIP_MAIN_PART" in @@ -969,7 +1003,8 @@ # remove event) would trigger automatic module loading (Bug 199456) if [ -d /sys/class/net/$INTERFACE ] ; then ip link set dev $INTERFACE down &>/dev/null - ip addr flush dev $INTERFACE &>/dev/null + ip -4 addr flush dev $INTERFACE &>/dev/null + ip -6 addr flush dev $INTERFACE &>/dev/null fi retcode=0 # $? ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.5/scripts/ifup-bonding new/sysconfig-0.80.6/scripts/ifup-bonding --- old/sysconfig-0.80.5/scripts/ifup-bonding 2013-01-31 11:48:29.000000000 +0100 +++ new/sysconfig-0.80.6/scripts/ifup-bonding 2013-05-16 10:35:17.000000000 +0200 @@ -251,6 +251,33 @@ fi } +# Init new slaves, e.g. link settings for the +# fail_over_mac=active mode, without to set UP. +init_slave () +{ + local SLAVE=$1 + local mtu lladdr + local MTU LLADDR LINK_OPTIONS + + get_variable MTU $SLAVE + get_variable LLADDR $SLAVE + get_variable LINK_OPTIONS $SLAVE + + # do not apply MTU / MAC when they're already set + if [ -n "$MTU" ] ; then + read mtu 2>/dev/null < "/sys/class/net/$SLAVE/mtu" + [ "$MTU" = "$mtu" ] && unset MTU + fi + if [ -n "$LLADDR" ] ; then + read lladdr 2>/dev/null < "/sys/class/net/$SLAVE/address" + [ "$LLADDR" = "$lladdr" ] && unset LLADDR + fi + [ -z "$MTU$LLADDR$LINK_OPTIONS" ] && return 0 + + ip link set dev $SLAVE ${MTU:+mtu $MTU} \ + ${LLADDR:+address $LLADDR} $LINK_OPTIONS >/dev/null +} + ###################################################################### # now do what has to be done @@ -296,6 +323,12 @@ ip link set down dev $BONDING_SLAVE fi + err=`init_slave $BONDING_SLAVE 2>&1` + if [ $? -gt 0 ]; then + message "`printf " %-9s unable to init slave %s: %s" \ + "$INTERFACE" "$BONDING_SLAVE" "$err"`" + fi + echo "+$BONDING_SLAVE" 2>/dev/null > "$sysfs_iface/bonding/slaves" if [ $? -gt 0 ]; then logerror "Could not enslave interface '$BONDING_SLAVE'" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.5/scripts/network new/sysconfig-0.80.6/scripts/network --- old/sysconfig-0.80.5/scripts/network 2013-02-22 09:14:14.000000000 +0100 +++ new/sysconfig-0.80.6/scripts/network 2013-05-16 10:35:18.000000000 +0200 @@ -593,13 +593,16 @@ status() { - local M IFACE + local M FIN IFACE # declare -i R=0 F=0 declare -i F=0 - if [ "$1" = "-m" ]; then - M=yes - shift - fi + while test $# -gt 0 ; do + case $1 in + --final) FIN=yes ; shift ;; + -m) M=yes ; shift ;; + *) break ;; + esac + done for IFACE in $@; do $FAKE /sbin/ifstatus $CONFIG $IFACE -o rc $CHECK $MODE RET=$? @@ -612,7 +615,9 @@ ;; $R_DHCP_BG) if [ -f "$NETWORK_RUNFILE" -a "$M" = yes ] ; then - if [ "$SD_RUNNING" != "yes" ] ; then + # do not report failure in --final check under + # systemd when setup is still in progress ... + if [ "$SD_RUNNING" != "yes" -o "$FIN" != "yes" ] ; then : $((F++)) fi fi @@ -772,7 +777,7 @@ test "$D" = __NSC__ && continue IFACE=$D if [ -d /sys/class/net/$IFACE ] ; then - status -m $IFACE && continue + status --final -m $IFACE && continue printf " %-9s interface could not be set up until now\n" $IFACE else printf " %-35s No interface found\n" $D @@ -881,7 +886,7 @@ for IFACE in $VIRTUAL_IFACES; do if [ -d /sys/class/net/$IFACE ] ; then - status -m $IFACE && continue + status --final -m $IFACE && continue printf " %-9s interface is not ready until now\n" $IFACE fi rc_failed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.5/scripts/poll.tcpip new/sysconfig-0.80.6/scripts/poll.tcpip --- old/sysconfig-0.80.5/scripts/poll.tcpip 2013-01-31 11:48:29.000000000 +0100 +++ new/sysconfig-0.80.6/scripts/poll.tcpip 2013-05-16 10:36:23.000000000 +0200 @@ -33,10 +33,6 @@ # Check resources and settings # PATH=/sbin:/bin:/usr/sbin:/usr/bin -set -- $(runlevel) -PREVLEVEL=$1 -RUNLEVEL=$2 -export PATH PREVLEVEL RUNLEVEL # # Time to get a stable connenction @@ -47,7 +43,11 @@ # Now set system time if we have some NTP servers # and no running ntp. # -/usr/sbin/rcntp status &> /dev/null +if type -p systemctl &> /dev/null ; then + systemctl status ntp.service &> /dev/null +else + /usr/sbin/rcntp status &> /dev/null +fi if test $? -eq 3 ; then /usr/sbin/rcntp ntptimeset else @@ -124,39 +124,28 @@ # remember that /usr/sbin/sendmail should be provided by # any other MTA like postfix or exim. # -if test -s /etc/sendmail.cf -a -s /etc/mail/submit.cf ; then +if test \( -s /etc/sendmail.cf -o -s /etc/mail/sendmail.cf \) \ + -a -s /etc/mail/submit.cf ; then send=no - for rc in /etc/init.d/rc${RUNLEVEL}.d/S*sendmail + for rc in /usr/lib/systemd/system/sendmail-client.service \ + /usr/lib/systemd/system/sendmail.service \ + /etc/init.d/sendmail do - if test -x $rc; then - $rc status &> /dev/null && send=yes - else + if test -e $rc; then send=yes + break fi - break done - if test "$send" = "yes" ; then + if test "$send" != "no" ; then /usr/sbin/sendmail -L sendmail-client -Ac -q sleep 3 /usr/sbin/sendmail -L sendmail -Am -q fi - unset send -else - send=no - for rc in /etc/init.d/rc${RUNLEVEL}.d/S*postfix \ - /etc/init.d/rc${RUNLEVEL}.d/S*exim - do - if test -x $rc; then - $rc status &> /dev/null && send=yes - else - send=yes - fi - break - done - if test "$send" = "yes" ; then - /usr/sbin/sendmail -q - fi - unset send + unset send rc +elif test -x /usr/sbin/sendmail ; then + /usr/sbin/sendmail -q +elif test -x /usr/lib/sendmail ; then + /usr/lib/sendmail -q fi # Tell system what we're done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.5/sysconfig.spec new/sysconfig-0.80.6/sysconfig.spec --- old/sysconfig-0.80.5/sysconfig.spec 2013-02-22 09:27:58.000000000 +0100 +++ new/sysconfig-0.80.6/sysconfig.spec 2013-05-16 11:04:40.000000000 +0200 @@ -18,7 +18,7 @@ Name: sysconfig -Version: 0.80.5 +Version: 0.80.6 Release: 0 Summary: The sysconfig scheme and traditional network scripts License: GPL-2.0+ @@ -129,10 +129,11 @@ # (guard for variable added to network/config later...) if [ -x /usr/sbin/NetworkManager ] && grep -qs "^NETWORKMANAGER=" \ var/adm/fillup-templates/sysconfig.config-network ; then + mkdir -p /dev/.sysconfig/network/ && \ grep -s "^NETWORKMANAGER=" etc/sysconfig/network/config \ - > /dev/.sysconfig/network/migrate_nm_variable + > /dev/.sysconfig/network/migrate_nm_variable || : elif [ -f /dev/.sysconfig/network/migrate_nm_variable ] ; then - rm -f /dev/.sysconfig/network/migrate_nm_variable + rm -f /dev/.sysconfig/network/migrate_nm_variable || : fi fi @@ -193,7 +194,7 @@ # and disable it, so /etc/init.d/network isn't masked... /usr/bin/systemctl stop NetworkManager.service || : /usr/bin/systemctl --force disable NetworkManager.service || : - rm -f /dev/.sysconfig/network/migrate_nm_variable + rm -f /dev/.sysconfig/network/migrate_nm_variable || : ;; yes) # Keep the /dev/.sysconfig/network/migrate_nm_variable file, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.5/sysconfig.spec.in new/sysconfig-0.80.6/sysconfig.spec.in --- old/sysconfig-0.80.5/sysconfig.spec.in 2013-02-22 09:27:34.000000000 +0100 +++ new/sysconfig-0.80.6/sysconfig.spec.in 2013-05-16 10:35:18.000000000 +0200 @@ -129,10 +129,11 @@ # (guard for variable added to network/config later...) if [ -x /usr/sbin/NetworkManager ] && grep -qs "^NETWORKMANAGER=" \ var/adm/fillup-templates/sysconfig.config-network ; then + mkdir -p /dev/.sysconfig/network/ && \ grep -s "^NETWORKMANAGER=" etc/sysconfig/network/config \ - > /dev/.sysconfig/network/migrate_nm_variable + > /dev/.sysconfig/network/migrate_nm_variable || : elif [ -f /dev/.sysconfig/network/migrate_nm_variable ] ; then - rm -f /dev/.sysconfig/network/migrate_nm_variable + rm -f /dev/.sysconfig/network/migrate_nm_variable || : fi fi @@ -193,7 +194,7 @@ # and disable it, so /etc/init.d/network isn't masked... /usr/bin/systemctl stop NetworkManager.service || : /usr/bin/systemctl --force disable NetworkManager.service || : - rm -f /dev/.sysconfig/network/migrate_nm_variable + rm -f /dev/.sysconfig/network/migrate_nm_variable || : ;; yes) # Keep the /dev/.sysconfig/network/migrate_nm_variable file, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
