Mailinglist Archive: opensuse-commit (1177 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package sysconfig for openSUSE:Factory
checked in at Fri Jan 9 02:03:54 CET 2009.


--------
--- sysconfig/sysconfig.changes 2008-12-19 13:55:18.000000000 +0100
+++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes    2009-01-08 
11:48:40.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Jan  8 11:28:54 CET 2009 - mt@xxxxxxx
+
+- Map obsolete (s390) interface type overrides to eth (bnc#458412).
+- Fixed ifdown-autoip to check if info file exists (bnc#463266).
+
+-------------------------------------------------------------------
+Wed Jan  7 10:33:05 CET 2009 - schwab@xxxxxxx
+
+- Fix syntax errors in network init script.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  sysconfig-ifdown-autoip-check-info.bnc463266.diff
  sysconfig-map-eth-interfacetypes.bnc458412.diff
  sysconfig-network.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sysconfig.spec ++++++
--- /var/tmp/diff_new_pack.i13175/_old  2009-01-09 02:03:29.000000000 +0100
+++ /var/tmp/diff_new_pack.i13175/_new  2009-01-09 02:03:29.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package sysconfig (Version 0.71.12)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 
 Name:           sysconfig
 Version:        0.71.12
-Release:        2
+Release:        3
 Summary:        The sysconfig scheme
 Group:          System/Base
 License:        GPL v2 or later
@@ -31,6 +31,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         %name-%version.tar.bz2
 Patch0:         sysconfig-ifup-dhcp-status-codes.bnc460093.diff
+Patch1:         sysconfig-network.diff
+Patch2:         sysconfig-map-eth-interfacetypes.bnc458412.diff
+Patch3:         sysconfig-ifdown-autoip-check-info.bnc463266.diff
 
 %description
 This package provides the SuSE system configuration scheme.
@@ -52,6 +55,9 @@
 %prep
 %setup -n sysconfig-%{version}
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
 
 %build
 autoreconf --force --install
@@ -251,6 +257,11 @@
 %{stop_on_removal network}
 
 %changelog
+* Thu Jan 08 2009 mt@xxxxxxx
+- Map obsolete (s390) interface type overrides to eth (bnc#458412).
+- Fixed ifdown-autoip to check if info file exists (bnc#463266).
+* Wed Jan 07 2009 schwab@xxxxxxx
+- Fix syntax errors in network init script.
 * Fri Dec 19 2008 mt@xxxxxxx
 - Fixed ifup-dhcp status to match BOOTPROTO settings (bnc#460093).
 * Thu Dec 11 2008 mt@xxxxxxx

++++++ sysconfig-ifdown-autoip-check-info.bnc463266.diff ++++++
--- scripts/ifup-autoip
+++ scripts/ifup-autoip 2009/01/08 10:25:13
@@ -163,7 +163,7 @@ case "$ACTION" in
        stop)
                debug "Shutting down service autoip on $INTERFACE"
                info=/var/lib/autoip/autoip-$INTERFACE.info
-               pid=`sed -ne 's/PID=//p' < $info`
+               test -f $info && pid=`sed -ne 's/PID=//p' < $info` || pid=''
                test -n "$pid" && kill $pid
                if [ "$AUTOIP_SET_DOWN_LINK" = yes ] ; then
                        ip link set down dev $INTERFACE
++++++ sysconfig-map-eth-interfacetypes.bnc458412.diff ++++++
Index: scripts/functions
===================================================================
--- scripts/functions   (Revision 1815)
+++ scripts/functions   (Arbeitskopie)
@@ -227,6 +227,12 @@
                ib*.*) INTERFACETYPE=ibchild ;;
                ib*)   INTERFACETYPE=ib      ;;
        esac
+
+       # bnc#458412: map obsolete (s390) eth type overrides
+       case "$INTERFACETYPE" in
+               (qeth|hsi|lcs|ctc|iucv|tr) INTERFACETYPE=eth ;;
+       esac
+
        test -n "$INTERFACETYPE" && echo $INTERFACETYPE && return
        if [ -z "$TYPE" ] ; then
                case $IF in
++++++ sysconfig-network.diff ++++++
--- scripts/network
+++ scripts/network
@@ -129,9 +129,9 @@ if [ "$NETWORKMANAGER" = yes ] ; then
 fi
 
 check_firewall() {
-       test "$MODE" = onboot && return -1
-       test "$FIREWALL" != yes && return -2
-       /sbin/SuSEfirewall2 -q status &>/dev/null || return -3
+       test "$MODE" = onboot && return 1
+       test "$FIREWALL" != yes && return 2
+       /sbin/SuSEfirewall2 -q status &>/dev/null || return 3
        return 0
 }
 
@@ -147,7 +147,7 @@ reload_firewall() {
 
 start_nm_online() {
        test -x "$NM_ONLINE_BIN" || return 0
-       if [ "$NM_ONLINE_TIMEOUT" == 0 ] ; then
+       if [ "$NM_ONLINE_TIMEOUT" = 0 ] ; then
 #              mesg "If service network should wait until connection is 
established"
 #              mesg "then set /etc/sysconfig/network/config:NM_ONLINE_TIMEOUT"
                return 0
@@ -164,7 +164,7 @@ start_nm_online() {
 cd "$OLDPWD"
 case "$ACTION" in
        start)
-               if [ "$NETWORKMANAGER" == yes ] ; then
+               if [ "$NETWORKMANAGER" = yes ] ; then
                        if nm_running; then
                                mesg_n "NetworkManager already running"
                                rc_status -v
@@ -248,7 +248,7 @@ case "$ACTION" in
                # NetworkManager does not support reload (2005.01.15).
                # If configuration and running system do not match exec restart.
                # Fall through if NetControl is confiured and NM not active.
-               if [ "$NETWORKMANAGER" == yes ] ; then
+               if [ "$NETWORKMANAGER" = yes ] ; then
                        if netcontrol_running; then
                                mesg "Changing Network Control System. Calling 
$0 restart"
                                exec $0 restart $CONFIG $INTERFACE 
${OPTIONS:+-o $OPTIONS}
@@ -265,7 +265,7 @@ case "$ACTION" in
                fi
                ;;
        status)
-               if [ "$NETWORKMANAGER" == yes ] ; then
+               if [ "$NETWORKMANAGER" = yes ] ; then
                        mesg_n "Checking for the NetworkManager: "
                        nm_running
                        rc_status -v
@@ -291,7 +291,7 @@ case "$ACTION" in
                echo "           type=<typelist>,skip=<skiplist>"
                echo "  typelist: space seperated list of interface types"
                echo "  skiplist: space seperated list of interfaces to skip 
for 'start'"
-               if [ "$NETWORKMANAGER" == yes ] ; then
+               if [ "$NETWORKMANAGER" = yes ] ; then
                echo
                        echo "Note:"
                        echo "  <config>, <interface> and options 
[on]boot,hotplug,manual" \
@@ -446,7 +446,7 @@ for a in $(type_filter `ls -A /sys/class
        case "$t" in
                eth|tr|ib|wlan)
                        STAMPFILE=$STAMPFILE_STUB`cat /sys/class/net/$a/ifindex`
-                       if [ "$MODE" == onboot -a "$ACTION" == start ] ; then
+                       if [ "$MODE" = onboot -a "$ACTION" = start ] ; then
                                # skip interfaces (with active drivers)
                                # but not yet prepared by an
                                #   ifup -o hotplug
@@ -716,7 +716,7 @@ status() {
 
 rc_reset
 declare -i FAILED=0
-if [ "$NETWORKMANAGER" == yes -a ${NM_STATUS:-0} -ne 0 ] ; then
+if [ "$NETWORKMANAGER" = yes -a ${NM_STATUS:-0} -ne 0 ] ; then
        FAILED=1
 fi
 

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx