Author: mzugec
Date: Wed Dec 9 13:55:27 2009
New Revision: 60018
URL: http://svn.opensuse.org/viewcvs/yast?rev=60018&view=rev
Log:
disable IPv6 (bnc#561611)
Modified:
branches/SuSE-Code-11-SP1-Branch/network/VERSION
branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes
branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp
Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/VERSION?rev=60018&r1=60017&r2=60018&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Wed Dec 9 13:55:27 2009
@@ -1 +1 @@
-2.17.114
+2.17.115
Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes?rev=60018&r1=60017&r2=60018&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original)
+++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Wed Dec 9 13:55:27 2009
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Dec 9 13:54:27 CET 2009 - mzugec@suse.de
+
+- disable IPv6 (bnc#561611)
+- 2.17.115
+
+-------------------------------------------------------------------
Mon Nov 30 09:50:12 CET 2009 - mzugec@suse.de
- fixed testsuite
Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp?rev=60018&r1=60017&r2=60018&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Wed Dec 9 13:55:27 2009
@@ -75,6 +75,7 @@
// ipv6 module
global boolean ipv6=true;
+
/**
* Hotplug type ("" if not hot pluggable)
*/
@@ -158,6 +159,29 @@
//include "network/routines.ycp";
//include "network/runtime.ycp";
+void readIPv6(){
+ ipv6=true;
+
+ list<string> filelist = ["sysctl.conf"];
+ string filepath = "/etc/";
+ string regexp = "^[[:space:]]*(net.ipv6.conf.all.disable_ipv6)[[:space:]]*=[[:space:]]*1";
+// uncomment bellow to read from old place
+// filelist = ["ipv6", "50-ipv6.conf"];
+// filepath ="/etc/modprobe.d/";
+// regexp = "^[[:space:]]*(install ipv6 /bin/true)";
+
+ foreach(string file, filelist,{
+ string filename=sformat("%1/%2", filepath, file);
+ if (FileUtils::Exists(filename)){
+ foreach(string row, splitstring((string)SCR::Read(.target.string, filename), "\n"), {
+ if (size(regexptokenize(String::CutBlanks(row), regexp))>0){
+ y2milestone("IPv6 is disabled.");
+ ipv6=false;
+ }
+ });
+ }
+ });
+}
/**
* Lan::Read (`cache) will do nothing if initialized already.
@@ -255,9 +279,12 @@
ProgressNextStage(_("Reading network configuration..."));
NetworkConfig::Read();
+/*
if (FileUtils::Exists("/etc/modprobe.d/ipv6")){
if (((map