summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-04-07 20:41:03 +0259
committerThomas Backlund <tmb@mageia.org>2015-04-07 20:41:03 +0259
commitafb05637bf4a886cd060f2bb54626574e21d73d3 (patch)
tree91c85c0ebb381da8493706b90e472783a6520e58
parent576d8e1f069dd221f7ceac6ba8ec50353677779e (diff)
downloaddrakx-afb05637bf4a886cd060f2bb54626574e21d73d3.tar
drakx-afb05637bf4a886cd060f2bb54626574e21d73d3.tar.gz
drakx-afb05637bf4a886cd060f2bb54626574e21d73d3.tar.bz2
drakx-afb05637bf4a886cd060f2bb54626574e21d73d3.tar.xz
drakx-afb05637bf4a886cd060f2bb54626574e21d73d3.zip
fix finding grub legacy files for hd_grub generation
-rw-r--r--images/NEWS1
-rwxr-xr-ximages/make_boot_img2
2 files changed, 2 insertions, 1 deletions
diff --git a/images/NEWS b/images/NEWS
index fd369707c..068a44b49 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,4 @@
+- fix finding grub legacy files for hd_grub generation
- syslinux needs more space on all.img
Version 2.20 - 7 April 2015 by Thomas Backlund
diff --git a/images/make_boot_img b/images/make_boot_img
index d73d89da6..15ba799eb 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -379,7 +379,7 @@ sub hd_grub {
my ($img) = @_;
my $mapfile = '/tmp/device.map.tmp';
- my ($grub_dir) = glob("/lib/grub/*-*");
+ my ($grub_dir) = glob("/lib/grub/*-mageia");
my @grub_files = map { "$grub_dir/$_" } qw(stage1 stage2);
# mtools wants the image to be a power of 32