diff --git a/debian/changelog b/debian/changelog index c322a34f0..8b5d3d5c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ grub2 (2.00+20131208-2) UNRELEASED; urgency=low * Adjust the postinst of grub-efi-ia64, grub-efi-arm, and grub-efi-arm64 to keep the EFI System Partition up to date with grub-install after it has been run once, like grub-efi-ia32 and grub-efi-amd64 already do. + * Regularise indentation of "recordfail" in /etc/grub.d/10_linux. -- Colin Watson Tue, 10 Dec 2013 17:39:47 +0000 diff --git a/debian/patches/quick_boot.patch b/debian/patches/quick_boot.patch index 053c53b13..f4ae136cb 100644 --- a/debian/patches/quick_boot.patch +++ b/debian/patches/quick_boot.patch @@ -14,7 +14,7 @@ Description: Add configure option to bypass boot menu if possible Author: Colin Watson Author: Richard Laager Forwarded: no -Last-Update: 2013-12-09 +Last-Update: 2013-12-11 Index: b/configure.ac =================================================================== @@ -228,7 +228,7 @@ Index: b/util/grub.d/10_linux.in echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" fi + if [ "$quick_boot" = 1 ]; then -+ echo "recordfail" | sed "s/^/$submenu_indentation/" ++ echo " recordfail" | sed "s/^/$submenu_indentation/" + fi if [ x$type != xrecovery ] ; then save_default_entry | grub_add_tab diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in index 9c1d0d37b..024a89e3d 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -129,7 +129,7 @@ linux_entry () echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" fi if [ "$quick_boot" = 1 ]; then - echo "recordfail" | sed "s/^/$submenu_indentation/" + echo " recordfail" | sed "s/^/$submenu_indentation/" fi if [ x$type != xrecovery ] ; then save_default_entry | grub_add_tab