diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2013-03-13 01:38:08 +0100 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2013-03-13 01:38:08 +0100 |
| commit | 2817345084849fcc0231910b52146f206164bdd6 (patch) | |
| tree | 06834dc122f4bec2e8a21c2707ad4371e7b4e78c /functions | |
| parent | 1620d26be1e1bec4ef0944be21bac81c1b853dcd (diff) | |
| download | mkinitcpio-2817345084849fcc0231910b52146f206164bdd6.tar.gz mkinitcpio-2817345084849fcc0231910b52146f206164bdd6.tar.xz | |
mkinitcpio: honor updates directory for firmware
This also removes a check which would have otherwise hidden a missing
firmware error from the user. FS#34255.
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Diffstat (limited to 'functions')
| -rw-r--r-- | functions | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -346,8 +346,11 @@ add_module() { map add_module "${deps[@]}" ;; firmware) - if [[ -e /usr/lib/firmware/$value ]]; then - add_file "/usr/lib/firmware/$value" "/usr/lib/firmware/$value" 644 + # ensure that we favor updated firmware files + if [[ -f $_d_firmware/updates/$value ]]; then + add_file "$_d_firmware/updates/$value" "$_d_firmware/updates/$value" 644 + else + add_file "$_d_firmware/$value" "$_d_firmware/$value" 644 fi ;; esac |