commit yast2-network

22 May 2006

Hello community,

here is the log from the commit of package yast2-network
checked in at Tue May 23 01:39:23 CEST 2006.

--------

--- yast2-network/yast2-network.changes	2006-05-19 15:25:05.000000000 +0200
+++ yast2-network/yast2-network.changes	2006-05-22 13:43:48.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 22 13:43:42 CEST 2006 - mvidner@suse.cz
+
+- Set STARTMODE=nfsroot for proposed interface if on iSCSI root (#176804).
+- 2.13.51
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.MGE88Z/_old	2006-05-23 01:39:00.000000000 +0200
+++ /var/tmp/diff_new_pack.MGE88Z/_new	2006-05-23 01:39:00.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-network (Version 2.13.50)
+# spec file for package yast2-network (Version 2.13.51)
 #
 # 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.50
+Version:        2.13.51
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-network-2.13.50.tar.bz2
+Source0:        yast2-network-2.13.51.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.50
+%setup -n yast2-network-2.13.51
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -103,6 +103,9 @@
 /usr/share/YaST2/schema/autoyast/rnc/networking.rnc
 
 %changelog -n yast2-network
+* Mon May 22 2006 - mvidner@suse.cz
+- Set STARTMODE=nfsroot for proposed interface if on iSCSI root (#176804).
+- 2.13.51
 * Fri May 19 2006 - mvidner@suse.cz
 - Tell NetworkManager when writing the dialup settings by calling
   rcnetwork reload (#162959).

++++++ yast2-network-2.13.50.tar.bz2 -> yast2-network-2.13.51.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.50/VERSION new/yast2-network-2.13.51/VERSION
--- old/yast2-network-2.13.50/VERSION	2006-05-19 15:21:45.000000000 +0200
+++ new/yast2-network-2.13.51/VERSION	2006-05-22 13:42:49.000000000 +0200
@@ -1 +1 @@
-2.13.50
+2.13.51
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.50/configure new/yast2-network-2.13.51/configure
--- old/yast2-network-2.13.50/configure	2006-05-19 15:27:20.000000000 +0200
+++ new/yast2-network-2.13.51/configure	2006-05-22 13:45:39.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.50.
+# Generated by GNU Autoconf 2.59 for yast2-network 2.13.51.
 #
 # 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.50'
-PACKAGE_STRING='yast2-network 2.13.50'
+PACKAGE_VERSION='2.13.51'
+PACKAGE_STRING='yast2-network 2.13.51'
 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.50 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.13.51 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.50:";;
+     short | recursive ) echo "Configuration of yast2-network 2.13.51:";;
    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.50
+yast2-network configure 2.13.51
 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.50, which was
+It was created by yast2-network $as_me 2.13.51, 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.50'
+ VERSION='2.13.51'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
 
 
 
-VERSION="2.13.50"
+VERSION="2.13.51"
 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.50, which was
+This file was extended by yast2-network $as_me 2.13.51, 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.50
+yast2-network config.status 2.13.51
 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.50/configure.in new/yast2-network-2.13.51/configure.in
--- old/yast2-network-2.13.50/configure.in	2006-05-19 15:27:08.000000000 +0200
+++ new/yast2-network-2.13.51/configure.in	2006-05-22 13:45:29.000000000 +0200
@@ -3,7 +3,7 @@
 dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-network, 2.13.50, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.13.51, 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.50"
+VERSION="2.13.51"
 RPMNAME="yast2-network"
 MAINTAINER="Martin Vidner <mvidner@suse.cz>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.50/src/modules/Lan.ycp new/yast2-network-2.13.51/src/modules/Lan.ycp
--- old/yast2-network-2.13.50/src/modules/Lan.ycp	2006-04-25 11:11:21.000000000 +0200
+++ new/yast2-network-2.13.51/src/modules/Lan.ycp	2006-05-22 13:44:06.000000000 +0200
@@ -4,7 +4,7 @@
  * Summary:	Network card data
  * Authors:	Michal Svec <msvec@suse.cz>
  *
- * $Id: Lan.ycp 30431 2006-04-25 09:11:15Z mvidner $
+ * $Id: Lan.ycp 31089 2006-05-22 11:43:52Z mvidner $
  *
  * Representation of the configuration of network cards.
  * Input and output routines.
@@ -27,6 +27,7 @@
 import "NetworkDevices";
 import "NetworkModules";
 import "NetworkService";
+import "NetworkStorage";
 import "Package";
 import "ProductFeatures";
 import "Routing";
@@ -1563,6 +1564,13 @@
     // #145041
     ethtool_options = InstallInf["ethtool_options"]:"";
 
+    // #176804
+    if (NetworkStorage::RootIsOnNetwork ())
+    {
+	startmode = "nfsroot";
+	y2milestone ("startmode nfsroot");
+    }
+
     ipaddr = InstallInf["ipaddr"]:"";
     bootproto = InstallInf["bootproto"]:"static";
     y2debug("ipaddr,bootproto=%1,%2", ipaddr, bootproto);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.50/src/modules/NetworkStorage.ycp new/yast2-network-2.13.51/src/modules/NetworkStorage.ycp
--- old/yast2-network-2.13.50/src/modules/NetworkStorage.ycp	1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-network-2.13.51/src/modules/NetworkStorage.ycp	2006-05-22 13:44:06.000000000 +0200
@@ -0,0 +1,39 @@
+/**
+ * File:	modules/NetworkStorage.ycp
+ * Package:	Network configuration
+ * Summary:	Networked disks
+ * Authors:	Martin Vidner <mvidner@suse.cz>
+ *
+ * $Id: NetworkStorage.ycp 31089 2006-05-22 11:43:52Z mvidner $
+ *
+ * #176804 - Root on iSCSI installation fails
+ */
+
+{
+
+module "NetworkStorage";
+
+/**
+ * If the root is on a networked device (NFS, ISCSI),
+ * the main NIC needs STARTMODE nfsroot instead of auto.
+ * @return root dev over network
+ */
+global boolean RootIsOnNetwork () {
+    string iscsi_cmd = "
+	ROOTPART=`sed 's,.*root=/dev/\\([^[:space:]]*\\).*,\1,' /proc/cmdline`
+	echo ROOTPART=\"$ROOTPART\"
+	# use * and .. to get to the device containing ROOTPART
+	case `cd -P /sys/block/*/\"$ROOTPART\"/../device && pwd` in
+	    *session*)
+		IS_ISCSI=true ;;
+	    *)
+		IS_ISCSI=false ;;
+	esac
+	$IS_ISCSI";
+    map out = (map) SCR::Execute (.target.bash_output, iscsi_cmd);
+    y2milestone ("%1", out);
+    return out["exit"]:-1 == 0;
+}
+
+/* EOF */
+}


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



Remember to have fun...

    

root＠suse.de

tags

participants (1)