Mailinglist Archive: yast-commit (953 mails)

< Previous Next >
[yast-commit] r49744 - in /trunk/network: VERSION package/yast2-network.changes src/clients/save_network.ycp src/lan/bridge.ycp
  • From: mzugec@xxxxxxxxxxxxxxxx
  • Date: Wed, 06 Aug 2008 07:21:04 -0000
  • Message-id: <20080806072104.DE178244ED@xxxxxxxxxxxxxxxx>
Author: mzugec
Date: Wed Aug 6 09:21:03 2008
New Revision: 49744

URL: http://svn.opensuse.org/viewcvs/yast?rev=49744&view=rev
Log:
- installation via wireless (bnc#223570)
- possibility to add bond device into bridge and device with /32
prefixlen (bnc#405343)


Modified:
trunk/network/VERSION
trunk/network/package/yast2-network.changes
trunk/network/src/clients/save_network.ycp
trunk/network/src/lan/bridge.ycp

Modified: trunk/network/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=49744&r1=49743&r2=49744&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Wed Aug 6 09:21:03 2008
@@ -1 +1 @@
-2.17.15
+2.17.16

Modified: trunk/network/package/yast2-network.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=49744&r1=49743&r2=49744&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Wed Aug 6 09:21:03 2008
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Wed Aug 6 09:18:00 CEST 2008 - mzugec@xxxxxxx
+
+- installation via wireless (bnc#223570)
+- possibility to add bond device into bridge and device with /32
+ prefixlen (bnc#405343)
+- 2.17.16
+
+-------------------------------------------------------------------
Tue Aug 5 10:28:41 CEST 2008 - mzugec@xxxxxxx

- improved help text (bnc#376063)

Modified: trunk/network/src/clients/save_network.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=49744&r1=49743&r2=49744&view=diff
==============================================================================
--- trunk/network/src/clients/save_network.ycp (original)
+++ trunk/network/src/clients/save_network.ycp Wed Aug 6 09:21:03 2008
@@ -100,11 +100,11 @@
ReadInstallInfItem(install_inf, "QETH_LAYER2_SUPPORT", "Layer2");
ReadInstallInfItem(install_inf, "LLADDR", "OSAHWAddr");

- ReadInstallInfItem(install_inf, "WlanESSID", "WESSID");
- ReadInstallInfItem(install_inf, "WlanAuth", "WAuth");
- ReadInstallInfItem(install_inf, "WlanKey", "WKey");
- ReadInstallInfItem(install_inf, "WlanKeyType", "WkeyType");
- ReadInstallInfItem(install_inf, "WlanKeyLen", "WkeyLen");
+ ReadInstallInfItem(install_inf, "WESSID", "WlanESSID");
+ ReadInstallInfItem(install_inf, "WAuth", "WlanAuth");
+ ReadInstallInfItem(install_inf, "WKey", "WlanKey");
+ ReadInstallInfItem(install_inf, "WkeyType", "WlanKeyType");
+ ReadInstallInfItem(install_inf, "WkeyLen", "WlanKeyLen");


/* Split network device */
@@ -210,27 +210,43 @@
SCR::Execute(.target.bash_output, "sed -i
s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g
/etc/sysconfig/network/dhcp");
}

- // wlan devices
- if (size(InstallInf["WESSID"]:"")>0 || size(InstallInf["WAuth"]:"")>0 ||
- size(InstallInf["WKey"]:"")>0 || size(InstallInf["WKeyType"]:"")>0 ||
- size(InstallInf["WKeyLen"]:"")>0)
+ // wireless devices (bnc#223570)
+ if ( size(InstallInf["WESSID"]:"")>0 )
{
network_configuration = sformat("%1WIRELESS_ESSID='%2'\n",
network_configuration, InstallInf["WESSID"]:"");
- network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n",
network_configuration, InstallInf["WAuth"]:"");
- network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n",
network_configuration, InstallInf["WAuth"]:"");
- network_configuration = sformat("%1WIRELESS_KEY_LENGTH='%2'\n",
network_configuration, InstallInf["WKeyLen"]:"");
- if (size(InstallInf["WKeyType"]:"")>0 &&
size(InstallInf["WKey"]:"")>0)
- network_configuration = sformat("%1WIRELESS_KEY_0='%2:%3'\n",
network_configuration,
+// network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n",
network_configuration, InstallInf["WAuth"]:"");
+ switch(InstallInf["WAuth"]:""){
+ case "" : // "" means wpa-psk
+ case "psk" :
+ network_configuration =
sformat("%1WIRELESS_WPA_PSK='%2'\n", network_configuration,
InstallInf["WKey"]:"");
+ network_configuration =
sformat("%1WIRELESS_AUTH_MODE='psk'\n", network_configuration);
+ break;
+ case "open" :
+ network_configuration =
sformat("%1WIRELESS_AUTH_MODE='no-encryption'\n", network_configuration);
+ break;
+ case "wep_open" :
+ case "wep_restricted" :
+ string type="";
+ if (InstallInf["WkeyType"]:""=="password") type="h:";
+ else if (InstallInf["WkeyType"]:""=="ascii")
type="s:";
+ network_configuration =
sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration,
(InstallInf["WAuth"]:""=="wep-open") ? "open" : "sharedkey");
+ network_configuration =
sformat("%1WIRELESS_DEFAULT_KEY='0'\n", network_configuration);
+ network_configuration =
sformat("%1WIRELESS_KEY_0='%2%3'\n", network_configuration, type,
InstallInf["WKey"]:"");
+ network_configuration =
sformat("%1WIRELESS_KEY_LENGTH='%2'\n", network_configuration,
InstallInf["WKeyLen"]:"");
+ if (size(InstallInf["WKeyType"]:"")>0 &&
size(InstallInf["WKey"]:"")>0)
+ network_configuration =
sformat("%1WIRELESS_KEY_0='%2:%3'\n", network_configuration,
substring(InstallInf["WKeyType"]:"", 0,
1), InstallInf["WKey"]:"");
+ break;
+ }
}


// if available, write MTU
- if (size(InstallInf["mtu"]:"")>0)
+ if (size(InstallInf["mtu"]:"")>0)
network_configuration = sformat("%1MTU='%2'\n", network_configuration,
InstallInf["mtu"]:"");

// for queth devices (s390)
- if (size(InstallInf["LLADDR"]:"")>0)
+ if (size(InstallInf["LLADDR"]:"")>0)
network_configuration = sformat("%1LLADDR='%2'\n",
network_configuration, InstallInf["LLADDR"]:"");



Modified: trunk/network/src/lan/bridge.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/bridge.ycp?rev=49744&r1=49743&r2=49744&view=diff
==============================================================================
--- trunk/network/src/lan/bridge.ycp (original)
+++ trunk/network/src/lan/bridge.ycp Wed Aug 6 09:21:03 2008
@@ -56,7 +56,10 @@
string device = t[0, 0]:"";
if (contains(sel, device) && hasAnyValue(device)) {
if (contains(confs, device)){
- if (contains(["tun", "tap"], NetworkInterfaces::GetType(device)))
continue;
+ // allow to add bonding device into bridge and also device with mask
/32(bnc#405343)
+ if (contains(["tun", "tap", "bond"], NetworkInterfaces::GetType(device)))
continue;
+ if (((string)configurations[NetworkInterfaces::GetType(device), device,
"PREFIXLEN"]:"" != "32")
+ || ((string)configurations[NetworkInterfaces::GetType(device), device,
"NETMASK"]:"" != "255.255.255.255"))
if ((string)configurations[NetworkInterfaces::GetType(device), device,
"IPADDR"]:"" != "0.0.0.0") {
if(!confirmed) {
valid = Popup::ContinueCancel(_("At least one selected device is
already configured.

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages