Author: mzugec Date: Tue Sep 4 15:16:07 2007 New Revision: 40747 URL: http://svn.opensuse.org/viewcvs/yast?rev=40747&view=rev Log: WLAN Installation - save data from install.inf (#223570) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=40747&r1=4074... ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Sep 4 15:16:07 2007 @@ -1 +1 @@ -2.15.72 +2.15.73 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.cha... ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Sep 4 15:16:07 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 4 15:14:46 CEST 2007 - mzugec@suse.cz + +- WLAN Installation - save data from install.inf (#223570) +- 2.15.73 + +------------------------------------------------------------------- Mon Sep 3 14:43:39 CEST 2007 - mzugec@suse.cz - install smartlink-softmodem package for devices with *ttySL* Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.... ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Tue Sep 4 15:16:07 2007 @@ -91,6 +91,13 @@ 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"); + + /* Split network device */ string netdevice = InstallInf["netdevice"]:""; if(netdevice != "") { @@ -184,10 +191,21 @@ 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){ + 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, substring(InstallInf["WKeyType"]:"", 0, 1), InstallInf["WKey"]:""); + } + + // if available, write MTU if (size(InstallInf["mtu"]:"")>0) network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); - + // for queth devices (s390) if (size(InstallInf["LLADDR"]:"")>0) network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org