From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 12 Jun 2010 10:51:10 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~816^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6d0c209d926f7d19dbd74fac969cc4c2460253b;p=thirdparty%2Fgrub.git

merge with mainline
---

d6d0c209d926f7d19dbd74fac969cc4c2460253b
diff --cc util/grub-install.in
index e5ed9dcd5,1e7fc1f2e..e580ac819
--- a/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 c3aa57723,d916459d6..0c17d07f6
--- a/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 ffb987718,61b0c94f7..cb20ec8d0
--- a/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 48e3ae243,2c49f5e13..e7a41f68f
--- a/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 a4739f95f,d8059bfaa..389c504c7
--- a/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 54c190678,258381485..7fc78b434
--- a/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 dde275c2a,72135213d..98fd5d65a
--- a/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 1adc149ae,d79627862..4ef26f616
--- a/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