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

	* util/grub.d/10_linux.in (linux_entry): Quote the arguments to
	printf and print a newline after the menuentry header line.
	* util/grub.d/10_kfreebsd.in (kfreebsd_entry): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 2b5b05425ac4c17a06690353714652671f93fde1..90721746b9446146db382cbc13336cb4f4536658 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-25  Felix Zielcke  <fzielcke@z-51.de>
+
+       * util/grub.d/10_linux.in (linux_entry): Quote the arguments to
+       printf and print a newline after the menuentry header line.
+       * util/grub.d/10_kfreebsd.in (kfreebsd_entry): Likewise.
+
 2009-11-25  Felix Zielcke  <fzielcke@z-51.de>
 
        autoconf >= 2.60 support $(localedir).

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 417fc93e3e8fe94f1f5e82ac887a6b6c4d09e858..1329bba1ff0d0e84b52230965a92986d37ba241a 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -38,7 +38,7 @@ kfreebsd_entry ()
   recovery="$3"        # not used yet
   args="$4"    # not used yet
   title="$(gettext "%s, with kFreeBSD %s")"
-  printf "menuentry \"${title}\" {" ${os} ${version}
+  printf "menuentry \"${title}\" {\n" "${os}" "${version}"
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 36a9fd9ea90e2d7f1867a7d9cf67e85b2b49163c..5fea5338e8deb6d8d79df4fbe962a41383b965ef 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -58,7 +58,7 @@ linux_entry ()
   else
     title="$(gettext "%s, with Linux %s")"
   fi
-  printf "menuentry \"${title}\" {" ${os} ${version}
+  printf "menuentry \"${title}\" {\n" "${os}" "${version}"
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi