Mailinglist Archive: yast-commit (953 mails)

< Previous Next >
[yast-commit] r49627 - in /trunk/network: VERSION package/yast2-network.changes src/lan/address.ycp src/modules/Lan.ycp src/modules/LanItems.ycp
  • From: mzugec@xxxxxxxxxxxxxxxx
  • Date: Mon, 04 Aug 2008 11:24:52 -0000
  • Message-id: <20080804112452.AC02931B34@xxxxxxxxxxxxxxxx>
Author: mzugec
Date: Mon Aug 4 13:24:52 2008
New Revision: 49627

URL: http://svn.opensuse.org/viewcvs/yast?rev=49627&view=rev
Log:
improved Lan::Packages() function
added STARTMODE=onboot for tun/tap devices (FaTE#302184)


Modified:
trunk/network/VERSION
trunk/network/package/yast2-network.changes
trunk/network/src/lan/address.ycp
trunk/network/src/modules/Lan.ycp
trunk/network/src/modules/LanItems.ycp

Modified: trunk/network/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=49627&r1=49626&r2=49627&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Mon Aug 4 13:24:52 2008
@@ -1 +1 @@
-2.17.13
+2.17.14

Modified: trunk/network/package/yast2-network.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=49627&r1=49626&r2=49627&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Mon Aug 4 13:24:52 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Aug 4 13:22:38 CEST 2008 - mzugec@xxxxxxx
+
+- improved Lan::Packages() function
+- added STARTMODE=onboot for tun/tap devices (FaTE#302184)
+- 2.17.14
+
+-------------------------------------------------------------------
Mon Jul 28 11:06:05 CEST 2008 - mzugec@xxxxxxx

- use all devices for InternetTest, not only eth (bnc#400632)

Modified: trunk/network/src/lan/address.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=49627&r1=49626&r2=49627&view=diff
==============================================================================
--- trunk/network/src/lan/address.ycp (original)
+++ trunk/network/src/lan/address.ycp Mon Aug 4 13:24:52 2008
@@ -732,6 +732,7 @@
{
settings = $[
"BOOTPROTO": "static",
+ "STARTMODE": "onboot",
"TUNNEL" : LanItems::type,
"TUNNEL_SET_PERSISTENT" : LanItems::tunnel_set_persistent ? "yes" :
"no",
"TUNNEL_SET_OWNER" : LanItems::tunnel_set_owner,

Modified: trunk/network/src/modules/Lan.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=49627&r1=49626&r2=49627&view=diff
==============================================================================
--- trunk/network/src/modules/Lan.ycp (original)
+++ trunk/network/src/modules/Lan.ycp Mon Aug 4 13:24:52 2008
@@ -1123,29 +1123,42 @@
if (!PackageSystem::Installed("smpppd")) pkgs = add (pkgs, "smpppd");
}
*/
- if (NetworkInterfaces::Locate ("STARTMODE", "ifplugd") != [])
- {
- if (!PackageSystem::Installed("ifplugd")) pkgs = add (pkgs, "ifplugd");
- }
- // #suse49880
- if (NetworkInterfaces::List ("wlan") != [])
- {
- if (!PackageSystem::Installed("wireless-tools")) pkgs = add (pkgs,
"wireless-tools");
- }
- if (NetworkInterfaces::List ("vlan") != [])
- {
- if (!PackageSystem::Installed("vlan")) pkgs = add (pkgs, "vlan");
- }
- if (NetworkInterfaces::List ("br") != [])
- {
- if (!PackageSystem::Installed("bridge-utils")) pkgs = add (pkgs,
"bridge-utils");
- }
- // #47809
- if (NetworkInterfaces::Locate ("WIRELESS_AUTH_MODE", "psk") != [] ||
- NetworkInterfaces::Locate ("WIRELESS_AUTH_MODE", "eap") != [])
- {
- if (!PackageSystem::Installed("wpa_supplicant")) pkgs = add (pkgs,
"wpa_supplicant");
- }
+ map<string, any> required = $[
+ "types":$[
+ "wlan" : "wireless-tools",
+ "vlan" : "vlan",
+ "br" : "bridge-utils",
+ "tun" : "tunctl",
+ "tap" : "tunctl"
+ ],
+ "options":$[
+ "STARTMODE":$[
+ "ifplugd" : "ifplugd"
+ ],
+ "WIRELESS_AUTH_MODE":$[
+ "psk" : "wpa_supplicant",
+ "eap" : "wpa_supplicant"
+ ]
+ ]
+ ];
+
+ foreach(string type, (list<string>)Map::Keys(required["types"]:$[]), {
+ string package=required["types", type]:"";
+ if (size( NetworkInterfaces::List(type) ) > 0)
+ y2milestone("Network interface type %1 requires package %2", type,
package);
+ if (!PackageSystem::Installed( package )) pkgs = add (pkgs, package);
+ });
+
+
+ foreach(string type, (list<string>)Map::Keys(required["options"]:$[]), {
+ foreach(string option, (list<string>)Map::Keys(required["options",
type]:$[]), {
+ string package=required["options", type, option]:"";
+ if (NetworkInterfaces::Locate (type, option) != [])
+ y2milestone("Network interface with options %1, %2 requires package
%3", type, option, package);
+ if (!PackageSystem::Installed(package)) pkgs = add (pkgs, package);
+ });
+ });
+
if (NetworkService::IsManaged ())
{
if (!PackageSystem::Installed("NetworkManager")) pkgs = add (pkgs,
"NetworkManager");

Modified: trunk/network/src/modules/LanItems.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=49627&r1=49626&r2=49627&view=diff
==============================================================================
--- trunk/network/src/modules/LanItems.ycp (original)
+++ trunk/network/src/modules/LanItems.ycp Mon Aug 4 13:24:52 2008
@@ -1203,6 +1203,7 @@
if (contains(["tun", "tap"], type)){
newdev=$[
"BOOTPROTO" : "static",
+ "STARTMODE" : "onboot",
"TUNNEL" : type,
"TUNNEL_SET_PERSISTENT" : tunnel_set_persistent ? "yes" : "no",
"TUNNEL_SET_OWNER" : tunnel_set_owner,

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

< Previous Next >
This Thread
  • No further messages