Hello community,
here is the log from the commit of package yast2-network
checked in at Sat Oct 21 21:43:12 CEST 2006.
--------
--- yast2-network/yast2-network.changes 2006-10-18 15:27:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2006-10-20 20:43:36.000000000 +0200
@@ -2 +2 @@
-Wed Oct 18 15:27:07 CEST 2006 - kmachalkova@suse.de
+Fri Oct 20 20:39:31 CEST 2006 - mzugec@suse.cz
@@ -4,2 +4,13 @@
-- Created SL10.2 package
-- 2.14.0
+- fate #300628 - indicate when netcard is not present
+- 2.14.2
+
+Fri Oct 20 14:28:48 CEST 2006 - mzugec@suse.cz
+
+- #176804 - root on iscsi
+- 2.13.70
+
+-------------------------------------------------------------------
+Wed Oct 18 19:15:16 CEST 2006 - mzugec@suse.cz
+
+- fate #300604 - UI to disable IPv6
+- 2.13.69
Old:
----
yast2-network-2.14.0.tar.bz2
New:
----
yast2-network-2.14.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.Py1sEJ/_old 2006-10-21 21:43:01.000000000 +0200
+++ /var/tmp/diff_new_pack.Py1sEJ/_new 2006-10-21 21:43:01.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.14.0)
+# spec file for package yast2-network (Version 2.14.2)
#
# 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.14.0
+Version: 2.14.2
Release: 1
License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.14.0.tar.bz2
+Source0: yast2-network-2.14.2.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -50,7 +50,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.14.0
+%setup -n yast2-network-2.14.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -105,9 +105,15 @@
/usr/share/YaST2/schema/autoyast/rnc/host.rnc
%changelog -n yast2-network
-* Wed Oct 18 2006 - kmachalkova@suse.de
-- Created SL10.2 package
-- 2.14.0
+* Fri Oct 20 2006 - mzugec@suse.cz
+- fate #300628 - indicate when netcard is not present
+- 2.14.2
+* Fri Oct 20 2006 - mzugec@suse.cz
+- #176804 - root on iscsi
+- 2.13.70
+* Wed Oct 18 2006 - mzugec@suse.cz
+- fate #300604 - UI to disable IPv6
+- 2.13.69
* Tue Oct 17 2006 - kmachalkova@suse.cz
- Improved Internet Test Dialog (show more info about devices,
disable Change Device button when not needed) (#208000)
++++++ yast2-network-2.14.0.tar.bz2 -> yast2-network-2.14.2.tar.bz2 ++++++
++++ 5786 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.14.0/Makefile.am new/yast2-network-2.14.2/Makefile.am
--- old/yast2-network-2.14.0/Makefile.am 2006-10-18 14:42:14.000000000 +0200
+++ new/yast2-network-2.14.2/Makefile.am 2006-10-20 20:29:50.000000000 +0200
@@ -67,7 +67,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in config.status
+$(RPMNAME).pc: $(RPMNAME).pc.in
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.14.0/VERSION new/yast2-network-2.14.2/VERSION
--- old/yast2-network-2.14.0/VERSION 2006-10-18 15:03:42.000000000 +0200
+++ new/yast2-network-2.14.2/VERSION 2006-10-20 20:39:20.000000000 +0200
@@ -1 +1 @@
-2.14.0
+2.14.2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.14.0/configure.in new/yast2-network-2.14.2/configure.in
--- old/yast2-network-2.14.0/configure.in 2006-10-18 14:42:14.000000000 +0200
+++ new/yast2-network-2.14.2/configure.in 2006-10-20 20:29:50.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.13.26 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.14.0, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.14.1, 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.14.0"
+VERSION="2.14.1"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.14.0/src/lan/complex.ycp new/yast2-network-2.14.2/src/lan/complex.ycp
--- old/yast2-network-2.14.0/src/lan/complex.ycp 2006-10-18 15:01:36.000000000 +0200
+++ new/yast2-network-2.14.2/src/lan/complex.ycp 2006-10-20 20:40:34.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec
*
- * $Id: complex.ycp 33495 2006-10-18 13:01:31Z kmachalkova $
+ * $Id: complex.ycp 33550 2006-10-20 18:40:32Z mzugec $
*/
{
@@ -209,6 +209,63 @@
return ret;
}
+define symbol IPv6Dialog () {
+ map > wd = $[
+ "IPV6": $[
+ "widget": `radio_buttons,
+ // radio button group label, method of setup
+ "label": _("IPv6 Support"),
+ "items": [
+ // radio button label
+ // the user can enable IPv6
+ ["enable", _("&Enable IPv6")],
+ // radio button label
+ // the user can disable IPv6
+ ["disable", _("&Disable IPv6")],
+ ],
+ "opt": [],
+ "help":
+ /* IPv6 help */
+_("<p>Select <b>Enable</b> IPv6 to enable ipv6 module in kernel.
+It is possible to use IPv6 together with IPv4. This is default option.
+") +
+ /* Network setup method help */
+_("<p>Select <b>Disable</b> IPv6 to disable autoload kernel module for ipv6.
+When ipv6 protocol is not used on your network, response time will be faster.
+") +
+_("<p>All changes will be applied after reboot.</p>"),
+ "init": ManagedInit,
+ "store": ManagedStore,
+ ],
+ ];
+
+ term contents = `VBox (
+ `HSquash ("IPV6")
+ );
+
+ map functions = $[
+ `abort : ReallyAbort,
+ ];
+
+ symbol ret = (symbol) CWM::ShowAndRun (
+ $[
+ "widget_descr": wd,
+ "contents": contents,
+ /* Address dialog caption */
+ "caption": _("Network Setup Method"),
+ "back_button" : Label::BackButton (),
+ "next_button" : Label::NextButton (),
+ // #54027
+ "disable_buttons" : (Mode::normal ()? ["back_button"] : []),
+ "fallback_functions" : functions,
+ ]);
+ // #148485: always show the device overview
+ if (false && ret == `next && NetworkService::IsManaged ())
+ {
+ ret = `managed;
+ }
+ return ret;
+}
/**
* Start configuring a new interface (`add or `managed).
* Also install needed packages.
@@ -246,7 +303,6 @@
* @return dialog result
*/
define any OverviewDialog() ``{
-y2internal("OverviewDialog");
ScreenName("lan-overview");
/* Network cards overview dialog caption */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.14.0/src/modules/Lan.ycp new/yast2-network-2.14.2/src/modules/Lan.ycp
--- old/yast2-network-2.14.0/src/modules/Lan.ycp 2006-10-18 15:01:36.000000000 +0200
+++ new/yast2-network-2.14.2/src/modules/Lan.ycp 2006-10-20 15:49:06.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 33495 2006-10-18 13:01:31Z kmachalkova $
+ * $Id: Lan.ycp 33539 2006-10-20 13:49:03Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -65,6 +65,8 @@
global string device = "";
global string alias = "";
+// ipv6 module
+global boolean ipv6=true;
/**
* Hotplug type ("" if not hot pluggable)
*/
@@ -313,6 +315,7 @@
/* Progress step 4/9 */
ProgressNextStage(_("Reading network configuration..."));
NetworkConfig::Read();
+ ipv6 = ((map)(SCR::Execute(.target.bash_output, "grep -v '^#' /etc/modprobe.conf.local|grep -q ipv6")))["exit"]:0==0?true:false;
sleep(sl);
if(Abort()) return false;
@@ -367,6 +370,19 @@
return Read (`cache);
}
+global void SetIPv6(boolean status){
+ ipv6=status;
+}
+
+void writeIPv6(){
+ boolean ipv6_before = ((map)(SCR::Execute(.target.bash_output, "grep -v '^#' /etc/modprobe.conf.local|grep -q ipv6")))["exit"]:0==0?true:false;
+ if (ipv6_before != ipv6){
+ if (ipv6==true) SCR::Execute(.target.bash_output, "echo 'install ipv6 /bin/true' >> /etc/modprobe.conf.local");
+ else SCR::Execute(.target.bash_output, "sed -i s/'install ipv6'/'#install ipv6'/g /etc/modprobe.conf.local");
+ }
+}
+
+
/**
* Update the SCR according to network settings
* @return true on success
@@ -451,6 +467,7 @@
/* Progress step 7 */
ProgressNextStage(_("Setting up network services..."));
NetworkService::EnableDisable ();
+ writeIPv6();
sleep(sl);
if(Abort()) return false;
@@ -668,6 +685,34 @@
}
/**
+ * Create a textual summary for the ipv6 proposal
+ * @return [rich text, links]
+ */
+global define list SummaryIPv6 () {
+ string status = nil;
+ string href = nil;
+ string link = nil;
+ if (ipv6)
+ {
+ href = "ipv6-disable";
+ // network mode: the interfaces are controlled by the user
+ status = _("Enabled Support for IPv6 Protocol");
+ // disable NetworkManager applet
+ link = Hyperlink (href, _("Disable IPv6"));
+ }
+ else
+ {
+ href = "ipv6-enable";
+ // network mode
+ status = _("Disabled Support for IPv6 Protocol");
+ // enable NetworkManager applet
+ link = Hyperlink (href, _("Enable IPv6"));
+ }
+ string descr = sformat ("<ul><li>%1 (%2)</li></ul>", status, link);
+ list<string> links = [ href ];
+ return [descr, links];
+}
+/**
* Create an overview table with all configured devices
* @return table items
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.14.0/src/modules/NetworkStorage.ycp new/yast2-network-2.14.2/src/modules/NetworkStorage.ycp
--- old/yast2-network-2.14.0/src/modules/NetworkStorage.ycp 2006-08-18 13:28:24.000000000 +0200
+++ new/yast2-network-2.14.2/src/modules/NetworkStorage.ycp 2006-10-20 15:49:06.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Networked disks
* Authors: Martin Vidner
*
- * $Id: NetworkStorage.ycp 31089 2006-05-22 11:43:52Z mvidner $
+ * $Id: NetworkStorage.ycp 33539 2006-10-20 13:49:03Z mzugec $
*
* #176804 - Root on iSCSI installation fails
*/
@@ -19,8 +19,11 @@
* @return root dev over network
*/
global boolean RootIsOnNetwork () {
+ // in create_interface script there is similar code (if some changes needed, don't forget check also that file)
+ // in case that parameter "root=..." is not defined (read from /proc/cmdline) say that device is NOT network
string iscsi_cmd = "
- ROOTPART=`sed 's,.*root=/dev/\\([^[:space:]]*\\).*,\1,' /proc/cmdline`
+ ROOT_DISK=$(grep ' / ' /proc/mounts|grep -v rootfs|cut -d' ' -f1);
+ ROOTPART=${ROOT_DISK##*/}
echo ROOTPART=\"$ROOTPART\"
# use * and .. to get to the device containing ROOTPART
case `cd -P /sys/block/*/\"$ROOTPART\"/../device && pwd` in
@@ -29,7 +32,8 @@
*)
IS_ISCSI=false ;;
esac
- $IS_ISCSI";
+ $IS_ISCSI
+";
map out = (map) SCR::Execute (.target.bash_output, iscsi_cmd);
y2milestone ("%1", out);
return out["exit"]:-1 == 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.14.0/src/routines/complex.ycp new/yast2-network-2.14.2/src/routines/complex.ycp
--- old/yast2-network-2.14.0/src/routines/complex.ycp 2006-08-18 13:28:25.000000000 +0200
+++ new/yast2-network-2.14.2/src/routines/complex.ycp 2006-10-20 20:40:34.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary and overview functions
* Authors: Michal Svec
*
- * $Id: complex.ycp 26655 2005-12-19 16:38:20Z mvidner $
+ * $Id: complex.ycp 33550 2006-10-20 18:40:32Z mzugec $
*
*/
@@ -486,6 +486,11 @@
// summary description of STARTMODE=managed
"managed": _("Managed by NetworkManager"),
];
+list<string> models = [];
+foreach(maprow, (list