nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone

Blame SOURCES/0391-Unify-more-code-in-grub-install_header.patch

f96e0b
From 5ece7791529296e557e7b38aa66ffb4262a96a31 Mon Sep 17 00:00:00 2001
f96e0b
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
f96e0b
Date: Mon, 29 Apr 2013 12:26:43 +0200
f96e0b
Subject: [PATCH 391/482] 	Unify more code in grub-install_header.
f96e0b
f96e0b
---
f96e0b
 ChangeLog                 |  4 ++++
f96e0b
 util/grub-install.in      | 37 -------------------------------------
f96e0b
 util/grub-install_header  | 40 ++++++++++++++++++++++++++++++++++++++++
f96e0b
 util/grub-mknetdir.in     | 36 ------------------------------------
f96e0b
 util/grub-mkrescue.in     | 39 ---------------------------------------
f96e0b
 util/grub-mkstandalone.in | 37 -------------------------------------
f96e0b
 6 files changed, 44 insertions(+), 149 deletions(-)
f96e0b
f96e0b
diff --git a/ChangeLog b/ChangeLog
f96e0b
index e4a7307..eff0b6b 100644
f96e0b
--- a/ChangeLog
f96e0b
+++ b/ChangeLog
f96e0b
@@ -1,5 +1,9 @@
f96e0b
 2013-04-29  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
 
f96e0b
+	Unify more code in grub-install_header.
f96e0b
+
f96e0b
+2013-04-29  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
+
f96e0b
 	Add few new tests.
f96e0b
 
f96e0b
 2013-04-29  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
diff --git a/util/grub-install.in b/util/grub-install.in
f96e0b
index d69ef3a..3dbd5da 100644
f96e0b
--- a/util/grub-install.in
f96e0b
+++ b/util/grub-install.in
f96e0b
@@ -17,38 +17,19 @@
f96e0b
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
f96e0b
 
f96e0b
 # Initialize some variables.
f96e0b
-prefix="@prefix@"
f96e0b
-exec_prefix="@exec_prefix@"
f96e0b
-datarootdir="@datarootdir@"
f96e0b
 sbindir="@sbindir@"
f96e0b
-bindir="@bindir@"
f96e0b
-libdir="@libdir@"
f96e0b
 sysconfdir="@sysconfdir@"
f96e0b
-PACKAGE_NAME=@PACKAGE_NAME@
f96e0b
-PACKAGE_TARNAME=@PACKAGE_TARNAME@
f96e0b
-PACKAGE_VERSION=@PACKAGE_VERSION@
f96e0b
-
f96e0b
-export TEXTDOMAIN=@PACKAGE@
f96e0b
-export TEXTDOMAINDIR="@localedir@"
f96e0b
 
f96e0b
 host_os=@host_os@
f96e0b
 target=
f96e0b
-datadir="@datadir@"
f96e0b
-if [ "x$pkgdatadir" = x ]; then
f96e0b
-    pkgdatadir="${datadir}/@PACKAGE@"
f96e0b
-fi
f96e0b
 localedir="@datadir@/locale"
f96e0b
 
f96e0b
-self="`basename $0`"
f96e0b
-
f96e0b
-grub_mkimage="${bindir}/@grub_mkimage@"
f96e0b
 grub_probe="${sbindir}/@grub_probe@"
f96e0b
 grub_editenv="${bindir}/@grub_editenv@"
f96e0b
 grub_mkrelpath="${bindir}/@grub_mkrelpath@"
f96e0b
 rootdir=
f96e0b
 bootdir=
f96e0b
 grubdir="`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`"
f96e0b
-modules=
f96e0b
 
f96e0b
 install_device=
f96e0b
 force_lba=
f96e0b
@@ -73,8 +54,6 @@ fi
f96e0b
 
f96e0b
 disk_module=unspecified
f96e0b
 
f96e0b
-. "${pkgdatadir}/grub-mkconfig_lib"
f96e0b
-
f96e0b
 # Usage: usage
f96e0b
 # Print the usage.
f96e0b
 usage () {
f96e0b
@@ -85,8 +64,6 @@ usage () {
f96e0b
     gettext "Install GRUB on your drive." ; echo
f96e0b
     echo
f96e0b
     print_option_help "-h, --help" "$(gettext "print this message and exit")"
f96e0b
-    print_option_help "-v, --version" "$(gettext "print the version information and exit")"
f96e0b
-    print_option_help "--modules=$(gettext "MODULES")" "$(gettext "pre-load specified modules MODULES")"
f96e0b
     grub_print_install_files_help
f96e0b
 
f96e0b
     dirmsg="$(gettext_printf "install GRUB images under the directory DIR/%s instead of the %s directory" "@grubdirname@" "$grubdir")"
f96e0b
@@ -96,7 +73,6 @@ usage () {
f96e0b
     # TRANSLATORS: "current" refers to the platform user's currently running on
f96e0b
     print_option_help "--target=$target_trans" "$(gettext "install GRUB for TARGET platform [default=current]")"
f96e0b
     print_option_help "--grub-setup=$(gettext "FILE")" "$(gettext "use FILE as grub-setup")"
f96e0b
-    print_option_help "--grub-mkimage=$(gettext "FILE")" "$(gettext "use FILE as grub-mkimage")"
f96e0b
     print_option_help "--grub-mkrelpath=$(gettext "FILE")" "$(gettext "use FILE as grub-mkrelpath")"
f96e0b
     print_option_help "--grub-probe=$(gettext "FILE")" "$(gettext "use FILE as grub-probe")"
f96e0b
     # TRANSLATORS: "may break" doesn't just mean that option wouldn't have any
f96e0b
@@ -140,14 +116,6 @@ do
f96e0b
     -h | --help)
f96e0b
 	usage
f96e0b
 	exit 0 ;;
f96e0b
-    -v | --version)
f96e0b
-	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
f96e0b
-	exit 0 ;;
f96e0b
-
f96e0b
-    --modules)
f96e0b
-	modules=`argument $option "$@"`; shift;;
f96e0b
-    --modules=*)
f96e0b
-	modules=`echo "$option" | sed 's/--modules=//'` ;;
f96e0b
 
f96e0b
     --force-file-id)
f96e0b
 	force_file_id=y ;;
f96e0b
@@ -189,11 +157,6 @@ do
f96e0b
     --bootloader-id=*)
f96e0b
 	bootloader_id="`echo "$option" | sed 's/--bootloader-id=//'`" ;;
f96e0b
 
f96e0b
-    --grub-mkimage)
f96e0b
-	grub_mkimage="`argument $option "$@"`"; shift;;
f96e0b
-    --grub-mkimage=*)
f96e0b
-	grub_mkimage="`echo "$option" | sed 's/--grub-mkimage=//'`" ;;
f96e0b
-
f96e0b
     --grub-mkrelpath)
f96e0b
 	grub_mkrelpath="`argument "$option" "$@"`"; shift;;
f96e0b
     --grub-mkrelpath=*)
f96e0b
diff --git a/util/grub-install_header b/util/grub-install_header
f96e0b
index 72d91e9..cf7fa9d 100644
f96e0b
--- a/util/grub-install_header
f96e0b
+++ b/util/grub-install_header
f96e0b
@@ -16,9 +16,34 @@ set -e
f96e0b
 # You should have received a copy of the GNU General Public License
f96e0b
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
f96e0b
 
f96e0b
+prefix="@prefix@"
f96e0b
+exec_prefix="@exec_prefix@"
f96e0b
+datarootdir="@datarootdir@"
f96e0b
+bindir="@bindir@"
f96e0b
+
f96e0b
+libdir="@libdir@"
f96e0b
+PACKAGE_NAME=@PACKAGE_NAME@
f96e0b
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
f96e0b
+PACKAGE_VERSION=@PACKAGE_VERSION@
f96e0b
+datadir="@datadir@"
f96e0b
+if [ "x$pkgdatadir" = x ]; then
f96e0b
+    pkgdatadir="${datadir}/@PACKAGE@"
f96e0b
+fi
f96e0b
+
f96e0b
+self=`basename $0`
f96e0b
+
f96e0b
+export TEXTDOMAIN=@PACKAGE@
f96e0b
+export TEXTDOMAINDIR="@localedir@"
f96e0b
+
f96e0b
+. "${pkgdatadir}/grub-mkconfig_lib"
f96e0b
+
f96e0b
+modules=
f96e0b
+
f96e0b
 pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst \
f96e0b
 handler.lst video.lst crypto.lst terminal.lst"
f96e0b
 
f96e0b
+grub_mkimage="${bindir}/@grub_mkimage@"
f96e0b
+
f96e0b
 grub_compress_file () {
f96e0b
     if [ "$compressor" != "" ] ; then
f96e0b
         "$compressor" $compressor_opts "$1" > "$2"
f96e0b
@@ -121,6 +146,7 @@ grub_install_files () {
f96e0b
 }
f96e0b
 
f96e0b
 grub_print_install_files_help () {
f96e0b
+    print_option_help "--modules=$(gettext "MODULES")" "$(gettext "pre-load specified modules MODULES")"
f96e0b
     print_option_help "--install-modules=$(gettext "MODULES")" "$(gettext "install only MODULES and their dependencies [default=all]")"
f96e0b
     print_option_help "--themes=THEMES" "$(gettext_printf "install THEMES [default=%s]" "starfield")"
f96e0b
     print_option_help "--fonts=FONTS" "$(gettext_printf "install FONTS [default=%s]" "unicode")"
f96e0b
@@ -129,6 +155,8 @@ grub_print_install_files_help () {
f96e0b
     # TRANSLATORS: platform here isn't identifier. It can be translated.
f96e0b
     dir_msg="$(gettext_printf "use images and modules under DIR [default=%s/<platform>]" "${libdir}/@PACKAGE@")"
f96e0b
     print_option_help "-d, --directory=$(gettext "DIR")" "$dir_msg"
f96e0b
+    print_option_help  "--grub-mkimage=$(gettext "FILE")" "$(gettext "use FILE as grub-mkimage")"
f96e0b
+    print_option_help "-v, --version" "$(gettext "print the version information and exit")"
f96e0b
 }
f96e0b
 
f96e0b
 install_modules=all
f96e0b
@@ -212,6 +240,18 @@ grub_process_install_options () {
f96e0b
 	    source_directory=`argument $option "$@"`; grub_process_install_options_consumed=2 ;;
f96e0b
 	--override-directory=*)
f96e0b
 	    source_directory=`echo "$option" | sed 's/--override-directory=//'` grub_process_install_options_consumed=1;;
f96e0b
+
f96e0b
+	--grub-mkimage)
f96e0b
+	    grub_mkimage=`argument $option "$@"`; grub_process_install_options_consumed=2 ;;
f96e0b
+        --grub-mkimage=*)
f96e0b
+	    grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'`;grub_process_install_options_consumed=1 ;;
f96e0b
+        --modules)
f96e0b
+	    modules=`argument $option "$@"`; grub_process_install_options_consumed=2;;
f96e0b
+        --modules=*)
f96e0b
+	    modules=`echo "$option" | sed 's/--modules=//'` grub_process_install_options_consumed=1;;
f96e0b
+        -v | --version)
f96e0b
+	    echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
f96e0b
+	    exit 0 ;;
f96e0b
     esac
f96e0b
 }
f96e0b
 
f96e0b
diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in
f96e0b
index 051b985..97d4155 100644
f96e0b
--- a/util/grub-mknetdir.in
f96e0b
+++ b/util/grub-mknetdir.in
f96e0b
@@ -15,23 +15,8 @@
f96e0b
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
f96e0b
 
f96e0b
 # Initialize some variables.
f96e0b
-prefix="@prefix@"
f96e0b
-exec_prefix="@exec_prefix@"
f96e0b
-datarootdir="@datarootdir@"
f96e0b
-bindir="@bindir@"
f96e0b
-libdir="@libdir@"
f96e0b
-PACKAGE_NAME=@PACKAGE_NAME@
f96e0b
-PACKAGE_TARNAME=@PACKAGE_TARNAME@
f96e0b
-PACKAGE_VERSION=@PACKAGE_VERSION@
f96e0b
 host_os=@host_os@
f96e0b
-datadir="@datadir@"
f96e0b
-if [ "x$pkgdatadir" = x ]; then
f96e0b
-    pkgdatadir="${datadir}/@PACKAGE@"
f96e0b
-fi
f96e0b
-
f96e0b
-self=`basename $0`
f96e0b
 
f96e0b
-grub_mkimage="${bindir}/@grub_mkimage@"
f96e0b
 rootdir=/srv/tftp
f96e0b
 modules=
f96e0b
 
f96e0b
@@ -48,11 +33,6 @@ efi32_dir="${libdir}/@PACKAGE@/i386-efi"
f96e0b
 efi64_dir="${libdir}/@PACKAGE@/x86_64-efi"
f96e0b
 itanium_dir="${libdir}/@PACKAGE@/ia64-efi"
f96e0b
 
f96e0b
-export TEXTDOMAIN=@PACKAGE@
f96e0b
-export TEXTDOMAINDIR="@localedir@"
f96e0b
-
f96e0b
-. "${pkgdatadir}/grub-mkconfig_lib"
f96e0b
-
f96e0b
 # Usage: usage
f96e0b
 # Print the usage.
f96e0b
 usage () {
f96e0b
@@ -60,12 +40,9 @@ usage () {
f96e0b
     gettext; echo "Install GRUB on your drive."; echo
f96e0b
     echo
f96e0b
     print_option_help "-h, --help" "$(gettext "print this message and exit")"
f96e0b
-    print_option_help "-v, --version" "$(gettext "print the version information and exit")"
f96e0b
-    print_option_help "--modules=$(gettext "MODULES")" "$(gettext "pre-load specified modules MODULES")"
f96e0b
     grub_print_install_files_help
f96e0b
     print_option_help "--net-directory=$(gettext "DIR")" "$(gettext "root directory of TFTP server")"
f96e0b
     print_option_help "--subdir=$(gettext "DIR")" "$(gettext "relative subdirectory on network server")"
f96e0b
-    print_option_help "--grub-mkimage=$(gettext "FILE")" "$(gettext "use FILE as grub-mkimage")"
f96e0b
     echo
f96e0b
     gettext_printf "%s copies GRUB images into net_directory/subdir/target_cpu-platform\n" "$self" 
f96e0b
     echo
f96e0b
@@ -88,14 +65,6 @@ do
f96e0b
     -h | --help)
f96e0b
 	usage
f96e0b
 	exit 0 ;;
f96e0b
-    -v | --version)
f96e0b
-	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
f96e0b
-	exit 0 ;;
f96e0b
-
f96e0b
-    --modules)
f96e0b
-	modules=`argument $option "$@"`; shift;;
f96e0b
-    --modules=*)
f96e0b
-	modules=`echo "$option" | sed 's/--modules=//'` ;;
f96e0b
 
f96e0b
     --net-directory)
f96e0b
 	rootdir=`argument $option "$@"`; shift;;
f96e0b
@@ -107,11 +76,6 @@ do
f96e0b
     --subdir=*)
f96e0b
 	subdir=`echo "$option" | sed 's/--subdir=//'` ;;
f96e0b
 
f96e0b
-    --grub-mkimage)
f96e0b
-	grub_mkimage=`argument $option "$@"`; shift;;
f96e0b
-    --grub-mkimage=*)
f96e0b
-	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
f96e0b
-
f96e0b
     # This is an undocumented feature...
f96e0b
     --debug)
f96e0b
 	debug=yes ;;
f96e0b
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
f96e0b
index a8d492e..b942c8f 100644
f96e0b
--- a/util/grub-mkrescue.in
f96e0b
+++ b/util/grub-mkrescue.in
f96e0b
@@ -18,22 +18,6 @@
f96e0b
 
f96e0b
 # Initialize some variables.
f96e0b
 
f96e0b
-prefix="@prefix@"
f96e0b
-exec_prefix="@exec_prefix@"
f96e0b
-datarootdir="@datarootdir@"
f96e0b
-bindir="@bindir@"
f96e0b
-libdir="@libdir@"
f96e0b
-PACKAGE_NAME=@PACKAGE_NAME@
f96e0b
-PACKAGE_TARNAME=@PACKAGE_TARNAME@
f96e0b
-PACKAGE_VERSION=@PACKAGE_VERSION@
f96e0b
-datadir="@datadir@"
f96e0b
-if [ "x$pkgdatadir" = x ]; then
f96e0b
-    pkgdatadir="${datadir}/@PACKAGE@"
f96e0b
-fi
f96e0b
-pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
f96e0b
-
f96e0b
-self=`basename $0`
f96e0b
-
f96e0b
 multiboot_dir="${libdir}/@PACKAGE@/i386-multiboot"
f96e0b
 coreboot_dir="${libdir}/@PACKAGE@/i386-coreboot"
f96e0b
 qemu_dir="${libdir}/@PACKAGE@/i386-qemu"
f96e0b
@@ -50,7 +34,6 @@ arcs_dir="${libdir}/@PACKAGE@/mips-arc"
f96e0b
 arc_dir="${libdir}/@PACKAGE@/mipsel-arc"
f96e0b
 ppc_dir="${libdir}/@PACKAGE@/powerpc-ieee1275"
f96e0b
 rom_directory=
f96e0b
-grub_mkimage="${bindir}/@grub_mkimage@"
f96e0b
 grub_render_label="${bindir}/@grub_render_label@"
f96e0b
 grub_glue_efi="${bindir}/@grub_glue_efi@"
f96e0b
 label_font="${pkgdatadir}/unicode.pf2"
f96e0b
@@ -61,13 +44,8 @@ product_version="${PACKAGE_VERSION}"
f96e0b
 
f96e0b
 xorriso=xorriso
f96e0b
 
f96e0b
-export TEXTDOMAIN=@PACKAGE@
f96e0b
-export TEXTDOMAINDIR="@localedir@"
f96e0b
-
f96e0b
 localedir="@datadir@/locale"
f96e0b
 
f96e0b
-. "${pkgdatadir}/grub-mkconfig_lib"
f96e0b
-
f96e0b
 # Usage: usage
f96e0b
 # Print the usage.
f96e0b
 usage () {
f96e0b
@@ -77,15 +55,11 @@ usage () {
f96e0b
     echo
f96e0b
     filetrans="$(gettext FILE)"
f96e0b
     print_option_help "-h, --help" "$(gettext "print this message and exit")"
f96e0b
-    print_option_help "-v, --version" "$(gettext "print the version information and exit")"
f96e0b
     print_option_help "-o, --output=$filetrans" "$(gettext "save output in FILE [required]")"
f96e0b
-    print_option_help "--modules=$(gettext "MODULES")" "$(gettext "pre-load specified modules MODULES")"
f96e0b
     grub_print_install_files_help
f96e0b
-    print_option_help "--install-modules=$(gettext "MODULES")" "$(gettext "install only MODULES and their dependencies on bootable media")"
f96e0b
     print_option_help "--rom-directory=$(gettext "DIR")" "$(gettext "save ROM images in DIR [optional]")"
f96e0b
     # TRANSLATORS: xorriso is a program for creating ISOs and burning CDs
f96e0b
     print_option_help "--xorriso=$filetrans" "$(gettext "use FILE as xorriso [optional]")"
f96e0b
-    print_option_help "--grub-mkimage=$filetrans" "$(gettext "use FILE as grub-mkimage")"
f96e0b
     print_option_help "--grub-glue-efi=$filetrans" "$(gettext "use FILE as grub-glue-efi")"
f96e0b
     print_option_help "--grub-render-label=$filetrans" "$(gettext "use FILE as grub-render-label")"
f96e0b
     print_option_help "--label-font=$filetrans" "$(gettext "use FILE as font for label")"
f96e0b
@@ -123,14 +97,6 @@ do
f96e0b
     -h | --help)
f96e0b
 	usage
f96e0b
 	exit 0 ;;
f96e0b
-    -v | --version)
f96e0b
-	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
f96e0b
-	exit 0 ;;
f96e0b
-
f96e0b
-    --modules)
f96e0b
-        modules=`argument $option "$@"`; shift ;;
f96e0b
-    --modules=*)
f96e0b
-	modules=`echo "$option" | sed 's/--modules=//'` ;;
f96e0b
 
f96e0b
     -o | --output)
f96e0b
 	output_image=`argument $option "$@"`; shift ;;
f96e0b
@@ -164,11 +130,6 @@ do
f96e0b
     --product-version=*)
f96e0b
 	product_version=`echo "$option" | sed 's/--product-version=//'` ;;
f96e0b
 
f96e0b
-    --grub-mkimage)
f96e0b
-	grub_mkimage=`argument $option "$@"`; shift ;;
f96e0b
-    --grub-mkimage=*)
f96e0b
-	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
f96e0b
-
f96e0b
     --grub-glue-efi)
f96e0b
 	grub_glue_efi=`argument $option "$@"`; shift ;;
f96e0b
     --grub-glue-efi=*)
f96e0b
diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in
f96e0b
index 30dd90f..b692c48 100644
f96e0b
--- a/util/grub-mkstandalone.in
f96e0b
+++ b/util/grub-mkstandalone.in
f96e0b
@@ -18,31 +18,10 @@
f96e0b
 
f96e0b
 # Initialize some variables.
f96e0b
 
f96e0b
-prefix="@prefix@"
f96e0b
-exec_prefix="@exec_prefix@"
f96e0b
-datarootdir="@datarootdir@"
f96e0b
-bindir="@bindir@"
f96e0b
-libdir="@libdir@"
f96e0b
-PACKAGE_NAME=@PACKAGE_NAME@
f96e0b
-PACKAGE_TARNAME=@PACKAGE_TARNAME@
f96e0b
-PACKAGE_VERSION=@PACKAGE_VERSION@
f96e0b
-datadir="@datadir@"
f96e0b
-if [ "x$pkgdatadir" = x ]; then
f96e0b
-    pkgdatadir="${datadir}/@PACKAGE@"
f96e0b
-fi
f96e0b
-
f96e0b
-self=`basename $0`
f96e0b
-
f96e0b
 compression=auto
f96e0b
 format=
f96e0b
-grub_mkimage="${bindir}/@grub_mkimage@"
f96e0b
 source=
f96e0b
 
f96e0b
-export TEXTDOMAIN=@PACKAGE@
f96e0b
-export TEXTDOMAINDIR="@localedir@"
f96e0b
-
f96e0b
-. "${pkgdatadir}/grub-mkconfig_lib"
f96e0b
-
f96e0b
 # Usage: usage
f96e0b
 # Print the usage.
f96e0b
 usage () {
f96e0b
@@ -51,15 +30,12 @@ usage () {
f96e0b
     gettext "Generate a standalone image (containing all modules) in the selected format"
f96e0b
     echo
f96e0b
     print_option_help "-h, --help" "$(gettext "print this message and exit")"
f96e0b
-    print_option_help "-v, --version" "$(gettext "print the version information and exit")"
f96e0b
     print_option_help "-o, --output=$(gettext FILE)" "$(gettext "save output in FILE [required]")"
f96e0b
     print_option_help "-O, --format=$(gettext "FORMAT")" "$(gettext "generate an image in FORMAT")"; echo
f96e0b
     print_option_help "" "$(gettext "available formats:") $formats"
f96e0b
     echo
f96e0b
     print_option_help "-C, --compression=(xz|none|auto)" "$(gettext "choose the compression to use for core image")"
f96e0b
-    print_option_help "--modules=$(gettext "MODULES")" "$(gettext "pre-load specified modules MODULES")"
f96e0b
     grub_print_install_files_help
f96e0b
-    print_option_help  "--grub-mkimage=$(gettext "FILE")" "$(gettext "use FILE as grub-mkimage")"
f96e0b
     echo
f96e0b
     gettext "Report bugs to <bug-grub@gnu.org>."; echo
f96e0b
 }
f96e0b
@@ -80,25 +56,12 @@ do
f96e0b
     -h | --help)
f96e0b
 	usage
f96e0b
 	exit 0 ;;
f96e0b
-    -v | --version)
f96e0b
-	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
f96e0b
-	exit 0 ;;
f96e0b
-
f96e0b
-    --modules)
f96e0b
-	modules=`argument $option "$@"`; shift ;;
f96e0b
-    --modules=*)
f96e0b
-	modules=`echo "$option" | sed 's/--modules=//'` ;;
f96e0b
 
f96e0b
     -o | --output)
f96e0b
 	output_image=`argument $option "$@"`; shift ;;
f96e0b
     --output=*)
f96e0b
 	output_image=`echo "$option" | sed 's/--output=//'` ;;
f96e0b
 
f96e0b
-    --grub-mkimage)
f96e0b
-	grub_mkimage=`argument $option "$@"`; shift ;;
f96e0b
-    --grub-mkimage=*)
f96e0b
-	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
f96e0b
-
f96e0b
     --compression | -C)
f96e0b
 	compression=`argument $option "$@"`; shift ;;
f96e0b
     --compression=*)
f96e0b
-- 
f96e0b
1.8.2.1
f96e0b