[yast-commit] r60768 - in /trunk/network: VERSION package/yast2-network.changes src/modules/Lan.ycp

Author: mzugec Date: Tue Feb 9 15:52:13 2010 New Revision: 60768 URL: http://svn.opensuse.org/viewcvs/yast?rev=60768&view=rev Log: ipv6: enable/disable both module and sysctl method (bnc#561611) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Lan.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=60768&r1=60767&r2=60768&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Feb 9 15:52:13 2010 @@ -1 +1 @@ -2.19.10 +2.19.11 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=60768&r1=60767&r2=60768&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Feb 9 15:52:13 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 9 15:51:34 CET 2010 - mzugec@suse.cz + +- ipv6: enable/disable both module and sysctl method (bnc#561611) +- 2.19.11 + +------------------------------------------------------------------- Mon Feb 8 16:23:46 CET 2010 - mzugec@suse.cz - correctly setup iucv devices (bnc#575950) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=60768&r1=60767&r2=60768&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Tue Feb 9 15:52:13 2010 @@ -141,25 +141,37 @@ 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)"; + map > methods = $[ + "builtin" : $[ + "filelist" : ["sysctl.conf"], + "filepath" : "/etc/", + "regexp" : "^[[:space:]]*(net.ipv6.conf.all.disable_ipv6)[[:space:]]*=[[:space:]]*1" + ], + "module" : $[ + "filelist" : ["ipv6", "50-ipv6.conf"], + "filepath" : "/etc/modprobe.d/", + "regexp" : "^[[:space:]]*(install ipv6 /bin/true)" + ] + ]; + + foreach(string which,map method, methods, { + list<string> filelist = method["filelist"]:[]; + string filepath = method["filepath"]:""; + string regexp = method["regexp"]:""; 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."); + y2milestone("IPv6 is disabled by '%1' method.", which); ipv6=false; } }); } }); + }); + } /** @@ -326,8 +338,9 @@ } void writeIPv6(){ +// SCR::Write(.target.string, "/etc/modprobe.d/ipv6", sformat("%1install ipv6 /bin/true", ipv6?"#":"")); // uncomment to write to old place (and comment code bellow) -// SCR::Write(.target.string, "/etc/modprobe.d/50-ipv6.conf", sformat("%1install ipv6 /bin/true", ipv6?"#":"")); + SCR::Write(.target.string, "/etc/modprobe.d/50-ipv6.conf", sformat("%1install ipv6 /bin/true\n", ipv6?"#":"")); string filename = "/etc/sysctl.conf"; string sysctl = (string)SCR::Read(.target.string, filename); string sysctl_row = sformat("%1net.ipv6.conf.all.disable_ipv6 = 1", ipv6?"# ":""); @@ -342,6 +355,7 @@ }); if (!found) file=add(file, sysctl_row); SCR::Write(.target.string, filename, mergestring(file, "\n")); + SCR::Execute(.target.bash, sformat("sysctl -w net.ipv6.conf.all.disable_ipv6=%1",!ipv6?"1":"0")); SCR::Write(.sysconfig.windowmanager.KDE_USE_IPV6, ipv6?"yes":"no"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org