Author: mzugec
Date: Thu Sep 4 15:21:32 2008
New Revision: 50679
URL: http://svn.opensuse.org/viewcvs/yast?rev=50679&view=rev
Log:
- IPv6 configuration (fate#304397)
- installation with IPv6 (fate#302926)
Modified:
trunk/network/VERSION
trunk/network/package/yast2-network.changes
trunk/network/src/clients/save_network.ycp
trunk/network/src/lan/address.ycp
trunk/network/src/modules/LanItems.ycp
Modified: trunk/network/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=50679&r1=50678&r2=50679&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Thu Sep 4 15:21:32 2008
@@ -1 +1 @@
-2.17.21
+2.17.22
Modified: trunk/network/package/yast2-network.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=50679&r1=50678&r2=50679&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Thu Sep 4 15:21:32 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Sep 4 15:18:14 CEST 2008 - mzugec@suse.cz
+
+- IPv6 configuration (fate#304397)
+- installation with IPv6 (fate#302926)
+- 2.17.22
+
+-------------------------------------------------------------------
Thu Sep 4 12:47:25 CEST 2008 - mzugec@suse.cz
- fixed yast lan list configured|unconfigured (bnc#420449)
Modified: trunk/network/src/clients/save_network.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=50679&r1=50678&r2=50679&view=diff
==============================================================================
--- trunk/network/src/clients/save_network.ycp (original)
+++ trunk/network/src/clients/save_network.ycp Thu Sep 4 15:21:32 2008
@@ -203,8 +203,11 @@
}
else
{
- //DHCP for IPv6 is not implemented yet in sysconfig
- network_configuration="BOOTPROTO='dhcp'\n";
+ //DHCP (also for IPv6) setup
+ if (InstallInf["bootproto"]:""=="dhcp") network_configuration="BOOTPROTO='dhcp4'\n";
+ else if (InstallInf["bootproto"]:""=="dhcp6") network_configuration="BOOTPROTO='dhcp6'\n";
+ else if (InstallInf["bootproto"]:""=="dhcp,dhcp6") network_configuration="BOOTPROTO='dhcp'\n";
+
// set DHCP_SET_HOSTNAME=yes #suse30528
y2milestone("set DHCLIENT_SET_HOSTNAME=yes on installed system");
SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp");
Modified: trunk/network/src/lan/address.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=50679&r1=50678&r2=50679&view=diff
==============================================================================
--- trunk/network/src/lan/address.ycp (original)
+++ trunk/network/src/lan/address.ycp Thu Sep 4 15:21:32 2008
@@ -193,6 +193,7 @@
void enableDisableBootProto(symbol current){
UI::ChangeWidget(`dyn, `Enabled, current==`dynamic);
+ UI::ChangeWidget(`dhcp_mode, `Enabled, current==`dynamic);
UI::ChangeWidget(`ipaddr, `Enabled, current==`static);
UI::ChangeWidget(`netmask, `Enabled, current==`static);
UI::ChangeWidget(`hostname, `Enabled, current==`static);
@@ -214,6 +215,13 @@
UI::ChangeWidget(`id(`hostname), `Value, settings["HOSTNAME"]:"");
break;
case "dhcp" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `dynamic);
+ UI::ChangeWidget(`id(`dhcp_mode), `Value, `dhcp_both);
+ break;
+ case "dhcp4" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `dynamic);
+ UI::ChangeWidget(`id(`dhcp_mode), `Value, `dhcp_v4);
+ break;
+ case "dhcp6" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `dynamic);
+ UI::ChangeWidget(`id(`dhcp_mode), `Value, `dhcp_v6);
break;
case "dhcp+autoip" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `dynamic);
UI::ChangeWidget(`id(`dyn), `Value, `dhcp_auto);
@@ -259,7 +267,15 @@
settings["HOSTNAME"]=(string)UI::QueryWidget(`hostname, `Value);
break;
default : switch ((symbol)UI::QueryWidget(`dyn, `Value)){
- case `dhcp: settings["BOOTPROTO"]="dhcp";
+ case `dhcp:
+ switch((symbol)UI::QueryWidget(`dhcp_mode, `Value)){
+ case `dhcp_both : settings["BOOTPROTO"]="dhcp";
+ break;
+ case `dhcp_v4 : settings["BOOTPROTO"]="dhcp4";
+ break;
+ case `dhcp_v6 : settings["BOOTPROTO"]="dhcp6";
+ break;
+ }
break;
case `dhcp_auto: settings["BOOTPROTO"]="dhcp+autoip";
break;
@@ -610,6 +626,11 @@
`item(`id(`dhcp), "DHCP"),
`item(`id(`dhcp_auto), "DHCP+Zeroconf"),
`item(`id(`auto), "Zeroconf")
+ ]),
+ `ComboBox(`id(`dhcp_mode), "", [
+ `item(`id(`dhcp_both), _("DHCP both version 4 and 6")),
+ `item(`id(`dhcp_v4), _("DHCP version 4 only")),
+ `item(`id(`dhcp_v6), _("DHCP version 6 only"))
])
)),
`VBox(
Modified: trunk/network/src/modules/LanItems.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=50679&r1=50678&r2=50679&view=diff
==============================================================================
--- trunk/network/src/modules/LanItems.ycp (original)
+++ trunk/network/src/modules/LanItems.ycp Thu Sep 4 15:21:32 2008
@@ -462,8 +462,8 @@
if (ip != "NONE")
{
string prefixlen = NetworkInterfaces::Current["PREFIXLEN"]:"";
- string descr = _("IP address assigned using DHCP");
- if (ip != "DHCP") descr=(size(prefixlen)>0) ?
+ string descr = sformat("%1 %2", _("IP address assigned using"), ip);
+ if (!issubstring(ip, "DHCP")) descr=(size(prefixlen)>0) ?
sformat(_("IP address: %1/%2"), ip, prefixlen) :
sformat(_("IP address: %1, subnet mask %2")
, ip, NetworkInterfaces::Current["NETMASK"]:"");
@@ -1013,7 +1013,6 @@
* @return true if success
*/
global define boolean Commit() {
-y2internal("name %1, current %2", NetworkInterfaces::Name, NetworkInterfaces::Current);
if(operation == `add || operation == `edit) {
map