Author: mzugec
Date: Thu Jun 7 17:46:23 2007
New Revision: 38349
URL: http://svn.opensuse.org/viewcvs/yast?rev=38349&view=rev
Log:
use static keyword for ISA/pnp devices hardware filenames (#208854)
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/lan/hardware.ycp
trunk/network/src/modules/Lan.ycp
trunk/network/src/routines/hardware.ycp
trunk/network/src/routines/routines.ycp
Modified: trunk/network/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38349&r1=38348&r2=38349&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Thu Jun 7 17:46:23 2007
@@ -1 +1 @@
-2.15.40
+2.15.41
Modified: trunk/network/package/yast2-network.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=38349&r1=38348&r2=38349&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Thu Jun 7 17:46:23 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Jun 7 17:45:24 CEST 2007 - mzugec@suse.cz
+
+- use static keyword for ISA/pnp devices hardware filenames (#208854)
+- 2.15.41
+
+-------------------------------------------------------------------
Wed Jun 6 16:31:35 CEST 2007 - mzugec@suse.cz
- values proposal for hardware dialog
Modified: trunk/network/src/clients/save_network.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=38349&r1=38348&r2=38349&view=diff
==============================================================================
--- trunk/network/src/clients/save_network.ycp (original)
+++ trunk/network/src/clients/save_network.ycp Thu Jun 7 17:46:23 2007
@@ -203,8 +203,15 @@
hwfile = sformat("static-0");
y2warning("vio bus type, using %1", hwfile);
} else {
- hwfile = sformat("bus-%1-%2", busname, busid);
+ // #208854 - include "static" string for ISA cards
+ if (busname=="isa")
+ {
+ hwfile = sformat("static-bus-%1-%2", busname, busid);
y2internal("will create hwcfg file %1", hwfile);
+ } else {
+ hwfile = sformat("bus-%1-%2", busname, busid);
+ y2internal("will create hwcfg file %1", hwfile);
+ }
}
} else {
Modified: trunk/network/src/lan/address.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=38349&r1=38348&r2=38349&view=diff
==============================================================================
--- trunk/network/src/lan/address.ycp (original)
+++ trunk/network/src/lan/address.ycp Thu Jun 7 17:46:23 2007
@@ -615,7 +615,7 @@
- string drvtype = Lan::DriverType (settings["IFCFGTYPE"]:"");
+ string drvtype = DriverType (settings["IFCFGTYPE"]:"");
boolean is_ptp = drvtype == "ctc" || drvtype == "iucv";
// TODO: dynamic for dummy. or add dummy from outside?
Modified: trunk/network/src/lan/hardware.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev=38349&r1=38348&r2=38349&view=diff
==============================================================================
--- trunk/network/src/lan/hardware.ycp (original)
+++ trunk/network/src/lan/hardware.ycp Thu Jun 7 17:46:23 2007
@@ -20,6 +20,7 @@
import "Wizard";
include "network/summary.ycp";
+include "network/routines.ycp";
/**
* Manual network card configuration dialog
@@ -90,7 +91,7 @@
// #38213, remember device id when we switch back from pcmcia/usb
hardware["non_hotplug_device_id"] = hardware["device"]:"";
hardware["hwcfg"] = Lan::nm_name;
- if (size(Lan::nm_name)==0 && size(Lan::nm_name_old)>0) hardware["hwcfg"]=Lan::nm_name_old;
+ if (!hasAnyValue(Lan::nm_name) && hasAnyValue(Lan::nm_name_old)) hardware["hwcfg"]=Lan::nm_name_old;
// FIXME duplicated in address.ycp
hardware["device_types"] = [ "arc", "bnep", "dummy", "eth", "fddi", "myri", "tr", "usb", "wlan", "bond" ];
@@ -221,7 +222,7 @@
UI::ReplaceWidget(`hw_content, contents);
-if (size(Lan::nm_name)==0 && size(Lan::nm_name_old)>0) UI::ChangeWidget(`enable_hwcfg, `Value, false);
+if (!hasAnyValue(Lan::nm_name) && hasAnyValue(Lan::nm_name_old)) UI::ChangeWidget(`enable_hwcfg, `Value, false);
hardware["no_hotplug"] = hardware["hotplug"]:"" == "";
hardware["no_hotplug_dummy"] = hardware["no_hotplug"]:false && hardware["type"]:"" != "dummy";
UI::ChangeWidget(`id(`modul), `Enabled, hardware["no_hotplug_dummy"]:false);
@@ -382,7 +383,7 @@
UI::ChangeWidget(`id(`num), `Value, hardware["device"]:"");
if(Arch::s390 ()) {
- string drvtype = Lan::DriverType (hardware["type"]:"");
+ string drvtype = DriverType (hardware["type"]:"");
if (contains (["lcs", "qeth", "ctc"], drvtype))
hardware["modul"] = drvtype;
@@ -498,7 +499,7 @@
/* S/390 dialog caption */
string caption = _("S/390 Network Card Configuration");
- string drvtype = Lan::DriverType (Lan::type);
+ string drvtype = DriverType (Lan::type);
string helptext = "";
term contents = `Empty ();
Modified: trunk/network/src/modules/Lan.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=38349&r1=38348&r2=38349&view=diff
==============================================================================
--- trunk/network/src/modules/Lan.ycp (original)
+++ trunk/network/src/modules/Lan.ycp Thu Jun 7 17:46:23 2007
@@ -292,6 +292,7 @@
*/
global list<string> getModulesFor(string busid, string default_module){
+ if (!hasAnyValue(busid)) return [];
string bus_id = substring(busid, findfirstof(busid, "0123456789"));
list<string> mods = [ default_module ];
foreach(map