summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-01-27 17:00:22 +0000
committerThierry Vignaud <tv@mageia.org>2012-01-27 17:00:22 +0000
commit9e38381e273ef3c843282e5b590da7154e548871 (patch)
tree943e5ea15dd0193bc8c901113599a2d90c70144f /images
parentad4570357d9120426c1b25e6e39f919cd7e87e49 (diff)
downloaddrakx-9e38381e273ef3c843282e5b590da7154e548871.tar
drakx-9e38381e273ef3c843282e5b590da7154e548871.tar.gz
drakx-9e38381e273ef3c843282e5b590da7154e548871.tar.bz2
drakx-9e38381e273ef3c843282e5b590da7154e548871.tar.xz
drakx-9e38381e273ef3c843282e5b590da7154e548871.zip
include dkms-modules.alias too (mga#1405)
Diffstat (limited to 'images')
-rw-r--r--images/NEWS2
-rwxr-xr-ximages/make_boot_img5
2 files changed, 5 insertions, 2 deletions
diff --git a/images/NEWS b/images/NEWS
index d1c565cb5..37352116e 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- include dkms-modules.alias too (mga#1405)
+
Version 1.62 - 20 January 2012 by Thierry Vignaud
- smaller stage1:
diff --git a/images/make_boot_img b/images/make_boot_img
index b3385a95b..d942d4a94 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -160,8 +160,9 @@ sub initrd {
_ "install -D /usr/share/ldetect-lst/$_.gz $tmp_initrd/usr/share/ldetect-lst/$_.gz";
}
_ "install -D /usr/share/pci.ids $tmp_initrd/usr/share/pci.ids";
- foreach ("/usr/share/ldetect-lst/fallback-modules.alias", "/lib/module-init-tools/ldetect-lst-modules.alias") {
- _ "install -D $_ $tmp_initrd$_";
+ foreach ("dkms-modules.alias", "fallback-modules.alias", "/lib/module-init-tools/ldetect-lst-modules.alias") {
+ my $file = m!^/! ? $_ : "/usr/share/ldetect-lst/$_";
+ _ "install -D $file $tmp_initrd$file";
}
foreach my $firm (glob_("all.kernels$I/$ext/firmware/*")) {
my $dest=$firm;