diff -u grub2-1.99/debian/changelog grub2-1.99/debian/changelog --- grub2-1.99/debian/changelog +++ grub2-1.99/debian/changelog @@ -1,3 +1,9 @@ +grub2 (1.99-21ubuntu3.1) precise-proposed; urgency=low + + * Switch to backwards compatible ${} syntax for grub.cfg (LP: #978464) + + -- Dmitrijs Ledkovs Tue, 15 May 2012 09:03:27 -0700 + grub2 (1.99-21ubuntu3) precise; urgency=low * Backport several upstream EFI device discovery patches to fix boot diff -u grub2-1.99/debian/patches/ubuntu_vt_handoff.patch grub2-1.99/debian/patches/ubuntu_vt_handoff.patch --- grub2-1.99/debian/patches/ubuntu_vt_handoff.patch +++ grub2-1.99/debian/patches/ubuntu_vt_handoff.patch @@ -40,8 +40,8 @@ +cat << 'EOF' +function gfxmode { -+ set gfxpayload="$1" -+ if [ "$1" = "keep" ]; then ++ set gfxpayload="${1}" ++ if [ "${1}" = "keep" ]; then + set vt_handoff=vt.handoff=7 + else + set vt_handoff= diff -u grub2-1.99/debian/patches/ubuntu_gfxpayload_filter.patch grub2-1.99/debian/patches/ubuntu_gfxpayload_filter.patch --- grub2-1.99/debian/patches/ubuntu_gfxpayload_filter.patch +++ grub2-1.99/debian/patches/ubuntu_gfxpayload_filter.patch @@ -208,7 +208,7 @@ + echo "set linux_gfx_mode=$GRUB_GFXPAYLOAD_LINUX" +else + cat << EOF -+if [ \${recordfail} != 1 ]; then ++if [ "\${recordfail}" != 1 ]; then + if [ -e \${prefix}/gfxblacklist.txt ]; then + if hwmatch \${prefix}/gfxblacklist.txt 3; then + if [ \${match} = 0 ]; then @@ -229,7 +229,7 @@ +fi +cat << EOF +export linux_gfx_mode -+if [ "\$linux_gfx_mode" != "text" ]; then load_video; fi ++if [ "\${linux_gfx_mode}" != "text" ]; then load_video; fi +EOF + while [ "x$list" != "x" ] ; do