* util/grub-reboot.in: Add missing datarootdir.

	Add missing newline.
	* util/grub-set-default.in: Add missing datarootdir.
	* util/powerpc/ieee1275/grub-mkrescue.in: Add missing newline.
	* util/grub-mkrescue.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 2d805f09e2eefdc4d9737ffea412492a46143a38..8407efe0b10d66a0062792d8c2d5c88ab55c36a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-reboot.in: Add missing datarootdir.
+       Add missing newline.
+       * util/grub-set-default.in: Add missing datarootdir.
+       * util/powerpc/ieee1275/grub-mkrescue.in: Add missing newline.
+       * util/grub-mkrescue.in: Likewise.
+
 2012-02-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub.d/30_os-prober.in: Fix TRANSLATORS comment.

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index bb55bc15a2e9f0666573ce0fd7aabf210878d86f..e86e6c39f1032248900a0810979b83a61ff7c055 100644 (file)
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -62,7 +62,7 @@ usage () {
     printf "  --xorriso=%-14s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as xorriso [optional]")"
     printf "  --grub-mkimage=%-9s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as grub-mkimage")"
     echo
-    gettext_printf "%s generates a bootable rescue image with specified source files, source directories, or mkisofs options listed by: %s" "xorriso -as mkisofs -help" "$self"
+    gettext_printf "%s generates a bootable rescue image with specified source files, source directories, or mkisofs options listed by: %s\n" "xorriso -as mkisofs -help" "$self"
     echo
     gettext "Option -- switches to native xorriso command mode."; echo
     echo

diff --git a/util/grub-reboot.in b/util/grub-reboot.in
index b003de10ab9ff58a5829994d6ba9e0c6d28c9fdd..400f497a1111c839e141f4701d27fe28452f44d1 100644 (file)
--- a/util/grub-reboot.in
+++ b/util/grub-reboot.in
@@ -24,6 +24,7 @@ exec_prefix=@exec_prefix@
 bindir=@bindir@
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
+datarootdir="@datarootdir@"
 datadir="@datadir@"
 
 self=`basename $0`
@@ -38,7 +39,7 @@ grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
 # Usage: usage
 # Print the usage.
 usage () {
-    gettext_printf "Usage: %s [OPTION] entry" "$self"
+    gettext_printf "Usage: %s [OPTION] entry\n" "$self"
     gettext "Set the default boot entry for GRUB, for the next boot only."; echo
     echo
     printf "  -h, --help              %s\n" "$(gettext "print this message and exit")"

diff --git a/util/grub-set-default.in b/util/grub-set-default.in
index 100ae99213445e77507391e5847342ee6c842b62..00100277398ca5cc5f4a183ff7dfee09cb045eba 100644 (file)
--- a/util/grub-set-default.in
+++ b/util/grub-set-default.in
@@ -24,6 +24,7 @@ exec_prefix=@exec_prefix@
 bindir=@bindir@
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
+datarootdir="@datarootdir@"
 datadir="@datadir@"
 
 self=`basename $0`

diff --git a/util/powerpc/ieee1275/grub-mkrescue.in b/util/powerpc/ieee1275/grub-mkrescue.in
index 9b0075ca615a0480d20fc63cd6e9d31023632963..992bd757d591e366b54fb552a9081d105c695147 100644 (file)
--- a/util/powerpc/ieee1275/grub-mkrescue.in
+++ b/util/powerpc/ieee1275/grub-mkrescue.in
@@ -46,7 +46,7 @@ usage () {
     printf "  --modules=%-14s%s\n" "$(gettext "MODULES")" "$(gettext "pre-load specified modules MODULES")"
     printf "  --grub-mkimage=%-9s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as grub-mkimage")"
     echo
-    gettext_printf "%s generates a bootable rescue image with specified source files, source directories, or mkisofs options listed by: %s" "genisoimage -help" "$self"
+    gettext_printf "%s generates a bootable rescue image with specified source files, source directories, or mkisofs options listed by: %s\n" "genisoimage -help" "$self"
     echo
     gettext "Report bugs to <bug-grub@gnu.org>."; echo
 }