Author: mzugec Date: Thu Dec 2 10:10:57 2010 New Revision: 62924 URL: http://svn.opensuse.org/viewcvs/yast?rev=62924&view=rev Log: removed obsolete 50-ipv6.conf (bnc#632530) 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=62924&r1=62923&r2=62924&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Dec 2 10:10:57 2010 @@ -1 +1 @@ -2.20.5 +2.20.6 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=62924&r1=62923&r2=62924&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Dec 2 10:10:57 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Dec 2 10:07:43 CET 2010 - mzugec@suse.cz + +- removed obsolete 50-ipv6.conf (bnc#632530) +- 2.20.6 + +------------------------------------------------------------------- Fri Nov 26 14:09:27 CET 2010 - mzugec@suse.cz - added search keywords (bnc#641922) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=62924&r1=62923&r2=62924&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Thu Dec 2 10:10:57 2010 @@ -149,12 +149,14 @@ "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<string,any> method, methods, { @@ -347,7 +349,7 @@ 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\n", 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?"# ":""); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org