merge with mainline

diff --cc util/grub-install.in
index e5ed9dcd58be6b38025034952a7bf9d0c6c7ea36,1e7fc1f2e5342cc9b92f27eec6321916585a8ad8..e580ac81926e637d9853ee80c41a567b9a0da1f2
--- 1/util/grub-install.in
--- 2/util/grub-install.in
+++ b/util/grub-install.in
@@@ -127,44 -110,22 +125,44 @@@ d
        usage
        exit 0 ;;
      -v | --version)
-       echo "grub-install (GNU GRUB ${PACKAGE_VERSION})"
+       echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
        exit 0 ;;
 +
 +    --modules)
 +      modules=`argument $option "$@"`; shift;;
      --modules=*)
        modules=`echo "$option" | sed 's/--modules=//'` ;;
 +
 +    --font)
 +      font=`argument $option "$@"`; shift;;
      --font=*)
        font=`echo "$option" | sed 's/--font=//'` ;;
 +
 +    --root-directory)
 +      rootdir=`argument $option "$@"`; shift;;
      --root-directory=*)
        rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
 +
 +    --grub-setup)
 +      grub_setup=`argument $option "$@"`; shift;;
      --grub-setup=*)
        grub_setup=`echo "$option" | sed 's/--grub-setup=//'` ;;
 +
 +    --grub-mkimage)
 +      grub_mkimage=`argument $option "$@"`; shift;;
      --grub-mkimage=*)
        grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
 +
 +    --grub-mkdevicemap)
 +      grub_mkdevicemap=`argument $option "$@"`; shift;;
      --grub-mkdevicemap=*)
        grub_mkdevicemap=`echo "$option" | sed 's/--grub-mkdevicemap=//'` ;;
 +
 +    --grub-probe)
 +      grub_probe=`argument $option "$@"`; shift;;
      --grub-probe=*)
        grub_probe=`echo "$option" | sed 's/--grub-probe=//'` ;;
 +
      --no-floppy)
        no_floppy="--no-floppy" ;;
      --recheck)

diff --cc util/grub-mkconfig.in
index c3aa577233c62170ed30ca2e179b57a6d4e9e5cb,d916459d6a511afa2b64efd8e7985a5be8aa6e33..0c17d07f6dcc6105c1dda60a17136c9d11505fe9
--- 1/util/grub-mkconfig.in
--- 2/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@@ -71,10 -65,11 +74,10 @@@ d
        usage
        exit 0 ;;
      -v | --version)
-       echo "$0 (GNU GRUB ${package_version})"
+       echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
        exit 0 ;;
 -    -o)
 -      next_grub_cfg=:
 -      ;;
 +    -o | --output)
 +      grub_cfg=`argument $option "$@"`; shift;;
      --output=*)
        grub_cfg=`echo "$option" | sed 's/--output=//'`
        ;;
@@@ -83,12 -78,13 +86,17 @@@
        usage
        exit 1
        ;;
 +    *)
 +      echo "Invalid parameter, $option" 1>&2
 +      exit 1
 +      ;;
      esac
  done
+ if $next_grub_cfg; then
+     echo "Missing argument to \`-o'" 1>&2
+     usage
+     exit 1
+ fi
  
  . ${libdir}/grub/grub-mkconfig_lib
  

diff --cc util/grub-mkrescue.in
index ffb9877183beec7a48d4839b521f66f1722218fa,61b0c94f7c49da5b7e90acb904f236a78a5c6c1a..cb20ec8d0ee9a148f3fec382915a3d8645477754
--- 1/util/grub-mkrescue.in
--- 2/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@@ -42,10 -51,12 +51,12 @@@ Make GRUB rescue image
  
    -h, --help              print this message and exit
    -v, --version           print the version information and exit
 -  --output=FILE           save output in FILE [required]
 +  -o, --output=FILE       save output in FILE [required]
    --modules=MODULES       pre-load specified modules MODULES
+   --rom-directory=DIR     save rom images in DIR [optional]
+   --grub-mkimage=FILE     use FILE as grub-mkimage
  
- $0 generates a bootable rescue image with specified source files or directories.
+ $self generates a bootable rescue image with specified source files or directories.
  
  Report bugs to <bug-grub@gnu.org>.
  EOF
@@@ -73,31 -69,22 +84,41 @@@ d
        usage
        exit 0 ;;
      -v | --version)
-       echo "$0 (GNU GRUB ${PACKAGE_VERSION})"
+       echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
        exit 0 ;;
 +
 +    --modules)
 +        modules=`argument $option "$@"`; shift ;;
      --modules=*)
        modules=`echo "$option" | sed 's/--modules=//'` ;;
 +
 +    -o | --output)
 +      output_image=`argument $option "$@"`; shift ;;
      --output=*)
        output_image=`echo "$option" | sed 's/--output=//'` ;;
 +
++    --rom-directory)
++        rom_directory=`argument $option "$@"`; shift ;;
+     --rom-directory=*)
+       rom_directory=`echo "$option" | sed 's/--rom-directory=//'` ;;
++
      # Intentionally undocumented
 +    --override-directory)
 +        override_dir=`argument $option "$@"`
 +      shift
 +      PATH=${override_dir}:$PATH
 +      export PATH
 +      ;;
      --override-directory=*)
        override_dir=`echo "${option}/" | sed 's/--override-directory=//'`
        PATH=${override_dir}:$PATH
        export PATH
        ;;
++
++    --grub-mkimage)
++      grub_mkimage=`argument $option "$@"`; shift ;;
+     --grub-mkimage=*)
+       grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
      -*)
        echo "Unrecognized option \`$option'" 1>&2
        usage

diff --cc util/grub-reboot.in
index 48e3ae24357e01d31cb912e464fc7e9f24261bfd,2c49f5e130dda52336fad4c8baa45ef1aef22eaf..e7a41f68ffc9bce55f29ed67f983a40170b7870e
--- 1/util/grub-reboot.in
--- 2/util/grub-reboot.in
+++ b/util/grub-reboot.in
@@@ -66,14 -55,10 +70,14 @@@ d
        usage
        exit 0 ;;
      -v | --version)
-       echo "grub-reboot (GNU GRUB ${PACKAGE_VERSION})"
+       echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
        exit 0 ;;
 +
 +    --root-directory)
 +      rootdir=`argument $option "$@"`; shift ;;
      --root-directory=*)
        rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
 +
      -*)
        echo "Unrecognized option \`$option'" 1>&2
        usage

diff --cc util/grub-set-default.in
index a4739f95f1d4b92232e08329e0b76213b82f6d67,d8059bfaa854ef4e66c65b6e3e8728a3215a2952..389c504c72707a1916040ef1cc9ab539c67048d6
--- 1/util/grub-set-default.in
--- 2/util/grub-set-default.in
+++ b/util/grub-set-default.in
@@@ -66,14 -55,10 +70,14 @@@ d
        usage
        exit 0 ;;
      -v | --version)
-       echo "grub-set-default (GNU GRUB ${PACKAGE_VERSION})"
+       echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
        exit 0 ;;
 +
 +    --root-directory)
 +      rootdir=`argument $option "$@"`; shift ;;
      --root-directory=*)
        rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
 +
      -*)
        echo "Unrecognized option \`$option'" 1>&2
        usage

diff --cc util/i386/efi/grub-install.in
index 54c1906784c9f7e3b0585ea9bcf9939652453ef1,25838148529e29030e37549aa6f497013142efb3..7fc78b434ddf92a24bba4bc78a169a6f8d4176ad
--- 1/util/i386/efi/grub-install.in
--- 2/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@@ -93,34 -80,18 +95,34 @@@ d
        usage
        exit 0 ;;
      -v | --version)
-       echo "grub-install (GNU GRUB ${PACKAGE_VERSION})"
+       echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
        exit 0 ;;
 +
 +    --modules)
 +        modules=`argument $option "$@"`; shift ;;
      --modules=*)
        modules=`echo "$option" | sed 's/--modules=//'` ;;
 +
 +    --root-directory)
 +      rootdir=`argument $option "$@"`; shift ;;
      --root-directory=*)
        rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
 +
 +    --grub-mkimage)
 +      grub_mkimage=`argument $option "$@"`; shift ;;
      --grub-mkimage=*)
        grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
 +
 +    --grub-mkdevicemap)
 +      grub_mkdevicemap=`argument $option "$@"`; shift ;;
      --grub-mkdevicemap=*)
        grub_mkdevicemap=`echo "$option" | sed 's/--grub-mkdevicemap=//'` ;;
 +
 +    --grub-probe)
 +      grub_probe=`argument $option "$@"`; shift ;;
      --grub-probe=*)
        grub_probe=`echo "$option" | sed 's/--grub-probe=//'` ;;
 +
      --no-floppy)
        no_floppy="--no-floppy" ;;
      --recheck)

diff --cc util/ieee1275/grub-install.in
index dde275c2a09b9703012e93bcf8cfda9da0a9302d,72135213dc6a59ceddd5f163c304af74947b90e4..98fd5d65a31f6a9b04894107e3cba170e2468884
--- 1/util/ieee1275/grub-install.in
--- 2/util/ieee1275/grub-install.in
+++ b/util/ieee1275/grub-install.in
@@@ -96,34 -83,18 +98,34 @@@ d
        usage
        exit 0 ;;
      -v | --version)
-       echo "grub-install (GNU GRUB ${PACKAGE_VERSION})"
+       echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
        exit 0 ;;
 +
 +    --modules)
 +      modules=`argument $option "$@"`; shift ;;
      --modules=*)
        modules=`echo "$option" | sed 's/--modules=//'` ;;
 +
 +    --root-directory)
 +      rootdir=`argument $option "$@"`; shift ;;
      --root-directory=*)
        rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
 +
 +    --grub-mkdevicemap)
 +      grub_mkdevicemap=`argument $option "$@"`; shift ;;
      --grub-mkdevicemap=*)
        grub_mkdevicemap=`echo "$option" | sed 's/--grub-mkdevicemap=//'` ;;
 +
 +    --grub-mkimage)
 +      grub_mkimage=`argument $option "$@"`; shift ;;
      --grub-mkimage=*)
        grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
 +
 +    --grub-probe)
 +      grub_probe=`argument $option "$@"`; shift ;;
      --grub-probe=*)
        grub_probe=`echo "$option" | sed 's/--grub-probe=//'` ;;
 +
      --no-nvram)
        update_nvram=no ;;
      # This is an undocumented feature...

diff --cc util/powerpc/ieee1275/grub-mkrescue.in
index 1adc149ae7d05d6f729b61756ee574bb03c10a54,d79627862ff06b2717af338b82773b38e8b83e93..4ef26f616c779b94ab7166a67760498c287ab1f7
--- 1/util/powerpc/ieee1275/grub-mkrescue.in
--- 2/util/powerpc/ieee1275/grub-mkrescue.in
+++ b/util/powerpc/ieee1275/grub-mkrescue.in
@@@ -76,24 -63,14 +78,24 @@@ d
        usage
        exit 0 ;;
      -v | --version)
-       echo "grub-mkrescue (GNU GRUB ${PACKAGE_VERSION})"
+       echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
        exit 0 ;;
 +
 +    --modules)
 +      modules=`argument $option "$@"`; shift ;;
      --modules=*)
        modules=`echo "$option" | sed 's/--modules=//'` ;;
 +
 +    --pkglibdir)
 +      input_dir=`argument $option "$@"`; shift ;;
      --pkglibdir=*)
        input_dir=`echo "$option" | sed 's/--pkglibdir=//'` ;;
 +
 +    --grub-mkimage)
 +      grub_mkimage=`argument $option "$@"`; shift ;;
      --grub-mkimage=*)
        grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
 +
      -*)
        echo "Unrecognized option \`$option'" 1>&2
        usage