Merge lp:~xnox/ubuntu/precise/grub2/fix-978464 into lp:~ubuntu-core-dev/ubuntu/precise/grub2/precise

[Dimitri John Ledkov]

* Switch to backwards compatible ${} syntax for grub.cfg (LP: #978464)

[lp:~xnox/ubuntu/precise/grub2/fix-978464]

2238. By Dimitri John Ledkov on 2012-05-15

Switch to backwards compatible ${} syntax for grub.cfg (LP: #978464)

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-17 15:14:46 +0000
+++ debian/changelog	2012-05-15 15:27:21 +0000
@@ -1,3 +1,9 @@
+grub2 (1.99-21ubuntu3.1) UNRELEASED; urgency=low
+
+  * Switch to backwards compatible ${} syntax for grub.cfg (LP: #978464)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Tue, 15 May 2012 12:49:46 +0100
+
 grub2 (1.99-21ubuntu3) precise; urgency=low
 
   * Backport several upstream EFI device discovery patches to fix boot

=== modified file 'debian/patches/ubuntu_gfxpayload_filter.patch'
--- debian/patches/ubuntu_gfxpayload_filter.patch	2011-09-15 15:18:07 +0000
+++ debian/patches/ubuntu_gfxpayload_filter.patch	2012-05-15 15:27:21 +0000
@@ -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

=== modified file 'debian/patches/ubuntu_vt_handoff.patch'
--- debian/patches/ubuntu_vt_handoff.patch	2012-04-05 09:49:54 +0000
+++ debian/patches/ubuntu_vt_handoff.patch	2012-05-15 15:27:21 +0000
@@ -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=