commit yast2-network

29 May 2006

Hello community,

here is the log from the commit of package yast2-network
checked in at Mon May 29 18:15:57 CEST 2006.

--------

--- yast2-network/yast2-network.changes	2006-05-22 13:43:48.000000000 +0200
+++ yast2-network/yast2-network.changes	2006-05-29 17:29:19.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 29 17:27:48 CEST 2006 - mvidner@suse.cz
+
+- Disable editing interfaces if we see a Xen bridge (#178848).
+- 2.13.52
+
+-------------------------------------------------------------------

Old:
----
  yast2-network-2.13.51.tar.bz2

New:
----
  yast2-network-2.13.52.tar.bz2

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

Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.U65MYR/_old	2006-05-29 18:15:23.000000000 +0200
+++ /var/tmp/diff_new_pack.U65MYR/_new	2006-05-29 18:15:23.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-network (Version 2.13.51)
+# spec file for package yast2-network (Version 2.13.52)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
 # norootforbuild
 
 Name:           yast2-network
-Version:        2.13.51
+Version:        2.13.52
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-network-2.13.51.tar.bz2
+Source0:        yast2-network-2.13.52.tar.bz2
 prefix:		/usr
 # should be required by devtools
 BuildRequires:  perl-XML-Writer pkgconfig
@@ -49,7 +49,7 @@
     Michal Svec <msvec@suse.cz>
 
 %prep
-%setup -n yast2-network-2.13.51
+%setup -n yast2-network-2.13.52
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -103,6 +103,9 @@
 /usr/share/YaST2/schema/autoyast/rnc/networking.rnc
 
 %changelog -n yast2-network
+* Mon May 29 2006 - mvidner@suse.cz
+- Disable editing interfaces if we see a Xen bridge (#178848).
+- 2.13.52
 * Mon May 22 2006 - mvidner@suse.cz
 - Set STARTMODE=nfsroot for proposed interface if on iSCSI root (#176804).
 - 2.13.51

++++++ yast2-network-2.13.51.tar.bz2 -> yast2-network-2.13.52.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.51/VERSION new/yast2-network-2.13.52/VERSION
--- old/yast2-network-2.13.51/VERSION	2006-05-22 13:42:49.000000000 +0200
+++ new/yast2-network-2.13.52/VERSION	2006-05-29 17:27:08.000000000 +0200
@@ -1 +1 @@
-2.13.51
+2.13.52
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.51/configure new/yast2-network-2.13.52/configure
--- old/yast2-network-2.13.51/configure	2006-05-22 13:45:39.000000000 +0200
+++ new/yast2-network-2.13.52/configure	2006-05-29 17:30:26.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-network 2.13.51.
+# Generated by GNU Autoconf 2.59 for yast2-network 2.13.52.
 #
 # Report bugs to <http://bugs.opensuse.org/>.
 #
@@ -269,8 +269,8 @@
 # Identity of this package.
 PACKAGE_NAME='yast2-network'
 PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.13.51'
-PACKAGE_STRING='yast2-network 2.13.51'
+PACKAGE_VERSION='2.13.52'
+PACKAGE_STRING='yast2-network 2.13.52'
 PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
 
 ac_unique_file="RPMNAME"
@@ -728,7 +728,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 yast2-network 2.13.51 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.13.52 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -795,7 +795,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of yast2-network 2.13.51:";;
+     short | recursive ) echo "Configuration of yast2-network 2.13.52:";;
    esac
   cat <<\_ACEOF
 
@@ -908,7 +908,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-yast2-network configure 2.13.51
+yast2-network configure 2.13.52
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by yast2-network $as_me 2.13.51, which was
+It was created by yast2-network $as_me 2.13.52, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1652,7 +1652,7 @@
 
 # Define the identity of the package.
  PACKAGE='yast2-network'
- VERSION='2.13.51'
+ VERSION='2.13.52'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
 
 
 
-VERSION="2.13.51"
+VERSION="2.13.52"
 RPMNAME="yast2-network"
 MAINTAINER="Martin Vidner <mvidner@suse.cz>"
 
@@ -2693,7 +2693,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by yast2-network $as_me 2.13.51, which was
+This file was extended by yast2-network $as_me 2.13.52, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-yast2-network config.status 2.13.51
+yast2-network config.status 2.13.52
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.51/configure.in new/yast2-network-2.13.52/configure.in
--- old/yast2-network-2.13.51/configure.in	2006-05-22 13:45:29.000000000 +0200
+++ new/yast2-network-2.13.52/configure.in	2006-05-29 17:30:15.000000000 +0200
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-network
 dnl
-dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-network, 2.13.51, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.13.52, http://bugs.opensuse.org/, yast2-network)
 dnl Check for presence of file 'RPMNAME'
 AC_CONFIG_SRCDIR([RPMNAME])
 
@@ -17,7 +17,7 @@
 AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
 
 dnl Important YaST2 variables
-VERSION="2.13.51"
+VERSION="2.13.52"
 RPMNAME="yast2-network"
 MAINTAINER="Martin Vidner <mvidner@suse.cz>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.51/src/lan/complex.ycp new/yast2-network-2.13.52/src/lan/complex.ycp
--- old/yast2-network-2.13.51/src/lan/complex.ycp	2006-02-07 20:28:06.000000000 +0100
+++ new/yast2-network-2.13.52/src/lan/complex.ycp	2006-05-29 17:29:31.000000000 +0200
@@ -4,7 +4,7 @@
  * Summary:	Summary, overview and IO dialogs for network cards config
  * Authors:	Michal Svec <msvec@suse.cz>
  *
- * $Id: complex.ycp 27719 2006-02-07 19:28:05Z mvidner $
+ * $Id: complex.ycp 31174 2006-05-29 15:29:23Z mvidner $
  */
 
 {
@@ -75,6 +75,23 @@
     Wizard::RestoreHelp(help);
     Lan::AbortFunction = ``{return PollAbort();};
     boolean ret = Lan::Read (`cache);
+
+    boolean xenbr = Lan::HaveXenBridge ();
+    if (xenbr)
+    {
+	if (! Popup::ContinueCancel (
+		sformat (
+		    // continue-cancel popup, #178848
+		    // %1 is a (long) path to a README file
+_("A Xen network bridge was detected.
+Due to the renaming of network interfaces by the bridge script,
+network interfaces should not be configured or restarted.
+See %1 for details."), "/usr/share/doc/packages/xen/README.SuSE")))
+	{
+	    ret = false;
+	}
+    }
+
     return ret ? `next : `abort;
 }
 
@@ -266,6 +283,7 @@
 	, [] );
     Wizard::EnableBackButton (); // ManagedDialog
 
+    boolean xenbr = Lan::HaveXenBridge ();
     boolean repaint = true;
     map ret = nil;
     while(true) {
@@ -275,6 +293,14 @@
 	    overview = overview + Lan::Unconfigured ();
 	    y2debug("overview=%1",overview);
 	    WizardHW::SetContents (overview);
+	    if (xenbr)
+	    {
+		// #178848
+		foreach (symbol b, [`add, `edit, `delete], {
+		    UI::ChangeWidget (`id (b), `Enabled, false);
+		});
+	    }
+
 	    repaint = false;
 	}
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.51/src/modules/Lan.ycp new/yast2-network-2.13.52/src/modules/Lan.ycp
--- old/yast2-network-2.13.51/src/modules/Lan.ycp	2006-05-22 13:44:06.000000000 +0200
+++ new/yast2-network-2.13.52/src/modules/Lan.ycp	2006-05-29 17:29:31.000000000 +0200
@@ -4,7 +4,7 @@
  * Summary:	Network card data
  * Authors:	Michal Svec <msvec@suse.cz>
  *
- * $Id: Lan.ycp 31089 2006-05-22 11:43:52Z mvidner $
+ * $Id: Lan.ycp 31174 2006-05-29 15:29:23Z mvidner $
  *
  * Representation of the configuration of network cards.
  * Input and output routines.
@@ -1873,5 +1873,16 @@
     modified = false;
 }
 
+/**
+ * Xen bridging confuses us (#178848)
+ * @return whether xenbr* exists
+ */
+global define boolean HaveXenBridge () {
+    string cmd = "brctl show | grep '^xenbr'";
+    boolean have_br = SCR::Execute (.target.bash, cmd) == 0;
+    y2milestone ("Have Xen bridge: %1", have_br);
+    return have_br;
+}
+
 /* EOF */
 }


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



Remember to have fun...

    

commit yast2-network

root＠suse.de