2009-11-21 Felix Zielcke <fzielcke@z-51.de>

	* util/grub-mkrescue.in: Print an error and usage if output option
	has not been given.

diff --git a/ChangeLog b/ChangeLog
index 868fd5c1358a42ed19649b0753119e3243c04e01..2e6ab2bdc16499935153355781436a6a5313f604 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-21  Felix Zielcke  <fzielcke@z-51.de>
+
+       * util/grub-mkrescue.in: Print an error and usage if output option
+       has not been given.
+
 2009-11-21  Felix Zielcke  <fzielcke@z-51.de>
 
        Patch from Loïc Minier <loic.minier@ubuntu.com>.

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 6f7d3338c08762d194e7eecadea86ea089127895..51639ccb19440986c50efc796c1e826829fac2fb 100644 (file)
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -42,7 +42,7 @@ Make GRUB rescue image.
   -h, --help              print this message and exit
   -v, --version           print the version information and exit
   --modules=MODULES       pre-load specified modules MODULES
-  --output=FILE           save output in FILE
+  --output=FILE           save output in FILE [required]
 
 $0 generates a bootable rescue image with specified source files or directories.
 
@@ -79,6 +79,12 @@ for option in "$@"; do
     esac
 done
 
+if [ "x${output_image}" = x ] ; then
+  echo "output file must be given" >&2
+  usage
+  exit 1
+fi
+
 iso9660_dir=`mktemp -d`
 mkdir -p ${iso9660_dir}/boot/grub