diff -Nru oem-config-1.37/lib/components/console_setup.py oem-config-1.37.1/lib/components/console_setup.py
--- oem-config-1.37/lib/components/console_setup.py	2008-04-21 20:31:50.000000000 +0100
+++ oem-config-1.37.1/lib/components/console_setup.py	2008-06-01 13:25:20.000000000 +0100
@@ -57,8 +57,7 @@
         # bother for now.
         return (['/usr/lib/oem-config/console/console-setup.postinst',
                  'configure'],
-                ['^console-setup/layout', '^console-setup/variant'],
-                {'OVERRIDE_ALLOW_PRESEEDING': '1'})
+                ['^console-setup/layout', '^console-setup/variant'])
 
     def run(self, priority, question):
         if self.done:
diff -Nru oem-config-1.37/scripts/tzsetup oem-config-1.37.1/scripts/tzsetup
--- oem-config-1.37/scripts/tzsetup	2007-03-13 14:15:51.000000000 +0000
+++ oem-config-1.37.1/scripts/tzsetup	2008-06-01 13:25:20.000000000 +0100
@@ -37,7 +37,7 @@
 # lib/components/timezone.py having set debian-installer/country for us.
 db_get debian-installer/country
 country="$RET"
-db_set mirror/country "$country"
+db_set mirror/country "$country" || true
 db_get debian-installer/locale
 newlocale="$(echo "$RET" | sed "s/_[A-Z][A-Z]*/_$country/")"
 if grep -q "^${newlocale%%[.@]*}[.@ ]" /usr/share/i18n/SUPPORTED; then