diff options
| author | Olivier Blin <blino@mageia.org> | 2012-04-29 23:59:36 +0000 |
|---|---|---|
| committer | Olivier Blin <blino@mageia.org> | 2012-04-29 23:59:36 +0000 |
| commit | eff043eb725ef2c2bbf88b28404b0bd5d371be7e (patch) | |
| tree | d26aac6773bf0c808c886ee399001ac01dd275b2 | |
| parent | 5ef40ab35c396d8f4a939f71ac48bb8987a48494 (diff) | |
| download | drakx-net-eff043eb725ef2c2bbf88b28404b0bd5d371be7e.tar drakx-net-eff043eb725ef2c2bbf88b28404b0bd5d371be7e.tar.gz drakx-net-eff043eb725ef2c2bbf88b28404b0bd5d371be7e.tar.bz2 drakx-net-eff043eb725ef2c2bbf88b28404b0bd5d371be7e.tar.xz drakx-net-eff043eb725ef2c2bbf88b28404b0bd5d371be7e.zip | |
another fix for iwlagn firmware installation since reported module name is iwlwifi (#5549)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/network/connection/wireless.pm | 9 |
2 files changed, 7 insertions, 4 deletions
@@ -1,6 +1,8 @@ - install rtlwifi-firmware for rtl8192 drivers - remove rtl8187se thirdparty check, it has been in mainline for a long time already +- another fix for iwlagn firmware installation since reported module + name is iwlwifi (#5549) 1.9 - further fix iwlagn firmware installation diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm index 1e25c70..491d0c2 100644 --- a/lib/network/connection/wireless.pm +++ b/lib/network/connection/wireless.pm @@ -123,19 +123,20 @@ my @thirdparty_settings = ( }, (map { - my ($version, $ucode_api, $ucode_version) = @$_; + my ($version, $ucode_api, $ucode_version, $package) = @$_; $ucode_version ||= $version; + $package ||= $version; { name => "iwl${version}", - description => "Intel(R) PRO/Wireless ${version}", + description => "Intel(R) PRO/Wireless ${package}", url => "http://intellinuxwireless.org/", firmware => { - package => "iwlwifi-${version}-ucode", + package => "iwlwifi-${package}-ucode", test_file => "iwlwifi-${ucode_version}${ucode_api}.ucode", }, sleep => 1, }; - } ([ 3945, '-2' ], [ 4965, '-2' ], [ 'agn', '-5', 5000 ])), + } ([ 3945, '-2' ], [ 4965, '-2' ], [ 'wifi', '-5', 5000, 'agn' ])), { name => 'p54pci', |