=== modified file 'debian/changelog'
--- debian/changelog	2009-12-12 16:46:15 +0000
+++ debian/changelog	2010-01-29 04:00:58 +0000
@@ -1,3 +1,12 @@
+grub2 (1.98~20091212-2) unstable; urgency=low
+
+  * Include "Default: no_auto_cmd console=tty" to grub2/linux_cmdline in
+  debian/templates.in. Closes: sv#28489.
+  * Include "machtype=8.9" to grub2/linux_cmdline_default in
+  in debian/templates.in. Fixes a bug where systems won't halt on shutdown.
+
+ -- Karl Goetz <karl@kgoetz.id.au>  Fri, 29 Jan 2010 14:24:19 +1030
+
 grub2 (1.98~20091212-1) unstable; urgency=low
 
   * New Bazaar snapshot.

=== modified file 'debian/templates.in'
--- debian/templates.in	2009-08-30 12:32:25 +0000
+++ debian/templates.in	2010-01-29 04:00:58 +0000
@@ -1,5 +1,6 @@
 Template: grub2/linux_cmdline
 Type: string
+Default: no_auto_cmd console=tty
 _Description: Linux command line:
  The following Linux command line was extracted from /etc/default/grub or the
  `kopt' parameter in GRUB Legacy's menu.lst.  Please verify that it is correct,
@@ -7,7 +8,7 @@
 
 Template: grub2/linux_cmdline_default
 Type: string
-Default: quiet
+Default: quiet machtype=8.9
 _Description: Linux default command line:
  The following string will be used as Linux parameters for the default menu
  entry but not for the recovery mode.

