Merge lp:~smoser/vmbuilder/automated-ec2-builds.lp1035279 into lp:~ubuntu-on-ec2/vmbuilder/automated-ec2-builds

[Scott Moser]

set GRUB_RECORDFAIL_TIMEOUT=0 on precise image builds

Previously, only quantal builds set GRUB_RECORDFAIL_TIMEOUT=0.

This also combines the setting of GRUB_TIMEOUT into a single location.
Previously, it was updated in one place for natty or later, and
a different location for quantal or later. Instead, we set a variable
and update based on that.

The other change done here is to move the RECORDFAIL and GRUB_TIMEOUT
changes outside of the 'GRUB_HIDDEN_TIMEOUT' block.
That block was also protected by 'dist_ge natty'.

=== modified file 'vmbuilder-cloudimg-fixes'
--- vmbuilder-cloudimg-fixes	2012-08-17 20:45:05 +0000
+++ vmbuilder-cloudimg-fixes	2012-08-20 15:29:23 +0000
@@ -221,20 +221,23 @@
          -e 's/^\(GRUB_HIDDEN_TIMEOUT_QUIET=.*\)/#\1/' \
          -e 's,^#GRUB_TERMINAL=console,GRUB_TERMINAL=console,' \
          "${rootd}/etc/default/grub"
-
-      # Eliminate grub time on Quantal or later
-      if dist_ge "${codename}" quantal; then
-         sed -i -e 's,^GRUB_TIMEOUT=.*,GRUB_TIMEOUT=0,' \
-             "${rootd}/etc/default/grub"
-
-         # Make recordfail setting permanent
-         printf "\n%s\n%s\n" "#Disable recordfail timeout" \
-            "GRUB_RECORDFAIL_TIMEOUT=0" >> "${rootd}/etc/default/grub"
-
-      elif  dist_ge "${codename}" natty; then
-         sed -i -e 's,^GRUB_TIMEOUT=.*,GRUB_TIMEOUT=5,' \
-             "${rootd}/etc/default/grub"
-      fi
+   fi
+
+   # on natty or later, modify/shorten GRUB_TIMEOUT
+   if dist_ge "${codename}" natty; then
+      new_timeout=5
+      # quantal removes the timeout entirely
+      dist_ge "$codename" quantal && new_timeout=0
+
+      sed -i -e "s,^GRUB_TIMEOUT=.*,GRUB_TIMEOUT=${new_timeout}," \
+          "${rootd}/etc/default/grub"
+   fi
+
+   # on precise or later, do not hang at grub prompt after incomplete boot.
+   # This requires a grub feature also. (LP: #1035279, LP: #669481)
+   if dist_ge "${codename}" precise; then
+      printf "\n%s\n%s\n" "#Disable recordfail timeout" \
+         "GRUB_RECORDFAIL_TIMEOUT=0" >> "${rootd}/etc/default/grub"
    fi
 
    _xchroot "${rootd}" /bin/sh -c \