Attachment 107350 Details for Bug 223871

The fixed patch :-)

complex.ycp.patch (text/x-patch), 3.14 KB, created by Peter Varkoly on 2006-11-29 10:48:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Varkoly

Created: 2006-11-29 10:48:31 UTC

Size: 3.14 KB

patch

obsolete

>Index: complex.ycp
>===================================================================
>--- complex.ycp	(revision 33999)
>+++ complex.ycp	(working copy)
>@@ -28,7 +28,6 @@
> import "Label";
> 
> import "Product";
>-import "Pkg";
> import "Package";
> 
> include "network/routines.ycp";
>@@ -291,7 +290,24 @@
>  * @return whether to proceed with editing and commiting the config
>  */
> define boolean AddInterface (integer hwid) {
>-    list <string> firmwares = ["ipw-firmware", "atmel-firmware", "qlogic-firmware"];
>+    //this is the map of kernel modules vs. requested firmware 
>+    //non-empty keys are firmware packages shipped by SUSE
>+    map <string, string> request_firmware = $[
>+	"atmel_pci" : "atmel-firmware", 
>+	"atmel_cs" : "atmel-firmware", 
>+	"bcm43xx" : "",
>+	"ipw2100" : "ipw-firmware",
>+	"ipw2200" : "ipw-firmware",
>+	"prism54" : "",
>+	"spectrum_cs" : "",
>+	"zd1201" : "",
>+	"zd1211rw" : "",
>+	"acx" : "",
>+	"at76_usb" : "atmel-firmware",
>+	"ipw3945" : "ipw-firmware",
>+	"rt61pci" : "", 
>+	"rt73usb" : "",
>+    ];
> 
>     Lan::Add ();
>     Lan::SelectHW (hwid);
>@@ -307,30 +323,34 @@
> 	    return false;
> 	}
>     }
>+    else if(haskey(request_firmware, NetworkModules::Alias)){
>+	string fw = request_firmware[NetworkModules::Alias]:"";
>+	if (fw != ""){
>+	    if ((!Package::Installed(fw) && !Package::Available(fw))){
>+		
>+		//check if package with the firmware is available
>+		//i.e. if there are any inst. sources defined
>+		//and if the package is available on any of them
>+
>+	        Popup::Message(sformat(_("The device needs a firmware to function properly. It can be installed from
>+%1 Add-On CD.\nTo install the firmware, add Add-On CD to your YaST installation sources and return 
>+to this configuration dialog."), Product::name));
>+		return false;
>+	    }
>+	}
>+	else {
>+		return (Popup::ContinueCancel(_("The device needs a firmware to function properly. It can be usually downloaded 
>+from your driver vendor web page.\nIf you have already downloaded and installed the firmware, click \'Continue\' 
>+to configure the device. Otherwise click \'Cancel\' and return to this dialog
>+once you have installed the firmware.")));
>+	}
>+    }
>     // this is one of 3 places to install packages :-(
>     // - kernel modules (InstallKernel): before loaded
>     // - smpppd & kinternet: before net start
>     // - wlan firmware: here, just because it is copied from modems
>     //   #45960
>     if(Lan::Requires != [] && Lan::Requires != nil) {
>-	boolean found = false;
>-	foreach(string fw, firmwares, {
>-	    if(contains(Lan::Requires, fw)){
>-		//check if package with the firmware is available
>-		//i.e. if there are any inst. sources defined
>-		//and if the package is available on any of them
>-		if ((Pkg::SourceGetCurrent(true) == []) || !Package::Available(fw)){
>-	            Popup::Message(sformat(_("The device needs a firmware to function properly. It can be installed from
>-%1 Add-On CD.\nTo install the firmware, add Add-On CD to your YaST installation sources and return 
>-to this configuration dialog."), Product::name));
>-		    found = true;
>-	            break; 
>-	        };
>-	    }
>-	});
>-	if (found)
>-	    return false;
>-
> 	if(PackagesInstall(Lan::Requires) != `next)
> 	    return false;
>     }

Actions: View

Attachments on bug 223871: 107032 | 107343 | 107348 | 107350