You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
43 lines
1.5 KiB
43 lines
1.5 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Glenn Washburn <development@efficientek.com> |
|
Date: Sun, 22 Jun 2014 01:45:11 +0200 |
|
Subject: [PATCH] * util/grub-install.c: Fix handling of --disk-module. |
|
|
|
--- |
|
util/grub-install.c | 3 +-- |
|
ChangeLog | 4 ++++ |
|
2 files changed, 5 insertions(+), 2 deletions(-) |
|
|
|
diff --git a/util/grub-install.c b/util/grub-install.c |
|
index e9c6a4656ef..7d61c32be2f 100644 |
|
--- a/util/grub-install.c |
|
+++ b/util/grub-install.c |
|
@@ -94,7 +94,6 @@ enum |
|
OPTION_RECHECK, |
|
OPTION_FORCE, |
|
OPTION_FORCE_FILE_ID, |
|
- OPTION_MODULE, |
|
OPTION_NO_NVRAM, |
|
OPTION_REMOVABLE, |
|
OPTION_BOOTLOADER_ID, |
|
@@ -273,7 +272,7 @@ static struct argp_option options[] = { |
|
N_("install even if problems are detected"), 2}, |
|
{"force-file-id", OPTION_FORCE_FILE_ID, 0, 0, |
|
N_("use identifier file even if UUID is available"), 2}, |
|
- {"disk-module", OPTION_MODULE, N_("MODULE"), 0, |
|
+ {"disk-module", OPTION_DISK_MODULE, N_("MODULE"), 0, |
|
N_("disk module to use (biosdisk or native). " |
|
"This option is only available on BIOS target."), 2}, |
|
{"no-nvram", OPTION_NO_NVRAM, 0, 0, |
|
diff --git a/ChangeLog b/ChangeLog |
|
index 0cdd095a498..4ce664327f9 100644 |
|
--- a/ChangeLog |
|
+++ b/ChangeLog |
|
@@ -1,3 +1,7 @@ |
|
+2014-06-21 Glenn Washburn <development@efficientek.com> |
|
+ |
|
+ * util/grub-install.c: Fix handling of --disk-module. |
|
+ |
|
2014-06-21 Stephane Rochoy <sheda> |
|
|
|
* grub-core/loader/i386/bsd.c (grub_netbsd_boot): Pass pointer to
|
|
|