|
 |
6b3c76 |
From c4640480f1a6a5eefcfcb8f82fbc8680c2f2989b Mon Sep 17 00:00:00 2001
|
|
|
a85e8e |
From: Glenn Washburn <development@efficientek.com>
|
|
|
a85e8e |
Date: Sun, 22 Jun 2014 01:45:11 +0200
|
|
|
6b3c76 |
Subject: [PATCH 086/261] * util/grub-install.c: Fix handling of --disk-module.
|
|
|
a85e8e |
|
|
|
a85e8e |
---
|
|
|
d41074 |
ChangeLog | 4 ++++
|
|
|
6b3c76 |
util/grub-install.c | 3 +--
|
|
|
a85e8e |
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
a85e8e |
|
|
|
6b3c76 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
6b3c76 |
index 0cdd095a4..4ce664327 100644
|
|
|
6b3c76 |
--- a/ChangeLog
|
|
|
6b3c76 |
+++ b/ChangeLog
|
|
|
6b3c76 |
@@ -1,3 +1,7 @@
|
|
|
6b3c76 |
+2014-06-21 Glenn Washburn <development@efficientek.com>
|
|
|
6b3c76 |
+
|
|
|
6b3c76 |
+ * util/grub-install.c: Fix handling of --disk-module.
|
|
|
6b3c76 |
+
|
|
|
6b3c76 |
2014-06-21 Stephane Rochoy <sheda>
|
|
|
6b3c76 |
|
|
|
6b3c76 |
* grub-core/loader/i386/bsd.c (grub_netbsd_boot): Pass pointer to
|
|
|
a85e8e |
diff --git a/util/grub-install.c b/util/grub-install.c
|
|
|
6b3c76 |
index e9c6a4656..7d61c32be 100644
|
|
|
a85e8e |
--- a/util/grub-install.c
|
|
|
a85e8e |
+++ b/util/grub-install.c
|
|
|
a85e8e |
@@ -94,7 +94,6 @@ enum
|
|
|
a85e8e |
OPTION_RECHECK,
|
|
|
a85e8e |
OPTION_FORCE,
|
|
|
a85e8e |
OPTION_FORCE_FILE_ID,
|
|
|
a85e8e |
- OPTION_MODULE,
|
|
|
a85e8e |
OPTION_NO_NVRAM,
|
|
|
a85e8e |
OPTION_REMOVABLE,
|
|
|
a85e8e |
OPTION_BOOTLOADER_ID,
|
|
|
a85e8e |
@@ -273,7 +272,7 @@ static struct argp_option options[] = {
|
|
|
a85e8e |
N_("install even if problems are detected"), 2},
|
|
|
a85e8e |
{"force-file-id", OPTION_FORCE_FILE_ID, 0, 0,
|
|
|
a85e8e |
N_("use identifier file even if UUID is available"), 2},
|
|
|
a85e8e |
- {"disk-module", OPTION_MODULE, N_("MODULE"), 0,
|
|
|
a85e8e |
+ {"disk-module", OPTION_DISK_MODULE, N_("MODULE"), 0,
|
|
|
a85e8e |
N_("disk module to use (biosdisk or native). "
|
|
|
a85e8e |
"This option is only available on BIOS target."), 2},
|
|
|
a85e8e |
{"no-nvram", OPTION_NO_NVRAM, 0, 0,
|
|
|
6b3c76 |
--
|
|
|
6b3c76 |
2.13.5
|
|
|
6b3c76 |
|