diff -Nru /tmp/8FP7uVGNPK/ubiquity-1.1.23/d-i/manifest /tmp/Z0Xd6eGPFL/ubiquity-1.1.24/d-i/manifest
--- /tmp/8FP7uVGNPK/ubiquity-1.1.23/d-i/manifest	2006-09-25 13:09:17.000000000 +0100
+++ /tmp/Z0Xd6eGPFL/ubiquity-1.1.24/d-i/manifest	2006-09-26 23:24:34.000000000 +0100
@@ -19,7 +19,7 @@
 partman-palo 4
 partman-partitioning 40ubuntu1
 partman-reiserfs 31
-partman-target 45ubuntu2
+partman-target 45ubuntu3
 partman-xfs 29
 silo-installer 1.04ubuntu1
 tzsetup 1:0.10ubuntu2
diff -Nru /tmp/8FP7uVGNPK/ubiquity-1.1.23/d-i/source/partman-target/debian/changelog /tmp/Z0Xd6eGPFL/ubiquity-1.1.24/d-i/source/partman-target/debian/changelog
--- /tmp/8FP7uVGNPK/ubiquity-1.1.23/d-i/source/partman-target/debian/changelog	2006-09-23 00:47:44.000000000 +0100
+++ /tmp/Z0Xd6eGPFL/ubiquity-1.1.24/d-i/source/partman-target/debian/changelog	2006-09-26 21:57:15.000000000 +0100
@@ -1,3 +1,11 @@
+partman-target (45ubuntu3) edgy; urgency=low
+
+  * Don't use UUIDs in fstab for those device types that volumeid.postinst
+    refuses to convert, namely /dev/disk/*, floppies, devmapper, EVMS, and
+    RAID (closes: Malone #62476).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 26 Sep 2006 21:57:11 +0100
+
 partman-target (45ubuntu2) edgy; urgency=low
 
   * Disable automatic mounting of USB removable devices (closes: Malone
diff -Nru /tmp/8FP7uVGNPK/ubiquity-1.1.23/d-i/source/partman-target/finish.d/fstab_hd_entries /tmp/Z0Xd6eGPFL/ubiquity-1.1.24/d-i/source/partman-target/finish.d/fstab_hd_entries
--- /tmp/8FP7uVGNPK/ubiquity-1.1.23/d-i/source/partman-target/finish.d/fstab_hd_entries	2006-07-25 11:50:00.000000000 +0100
+++ /tmp/Z0Xd6eGPFL/ubiquity-1.1.24/d-i/source/partman-target/finish.d/fstab_hd_entries	2006-09-26 21:49:10.000000000 +0100
@@ -13,6 +13,9 @@
     sort |
     while read mp fs type options dump pass; do
 	case "$fs" in
+	    (/dev/disk/*|/dev/fd[0-9]*|/dev/mapper/*|/dev/evms/*|/dev/md[0-9]*)
+		printf "%-15s %-15s %-7s %-15s %-7s %s\n" "$(mapdevfs $fs)" "${mp}" "$type" "$options" "$dump" "$pass"
+		;;
 	    (/*)
 		uuid="$(PATH="/lib/udev:$PATH" vol_id -u $fs)"
 		if [ "$uuid" ]; then
diff -Nru /tmp/8FP7uVGNPK/ubiquity-1.1.23/debian/changelog /tmp/Z0Xd6eGPFL/ubiquity-1.1.24/debian/changelog
--- /tmp/8FP7uVGNPK/ubiquity-1.1.23/debian/changelog	2006-09-25 13:11:29.000000000 +0100
+++ /tmp/Z0Xd6eGPFL/ubiquity-1.1.24/debian/changelog	2006-09-26 23:29:55.000000000 +0100
@@ -1,3 +1,15 @@
+ubiquity (1.1.24) edgy; urgency=low
+
+  * Mark console-setup/layout and console-setup/variant as unseen before
+    starting console-setup, to avoid incorrect variant choices (although I
+    think there's also a console-setup bug here in that the variants are
+    being substituted in the wrong order).
+  * Depend on a version of console-setup without the misguided
+    /etc/X11/xorg.conf handling.
+  * Automatic update of included source packages: partman-target 45ubuntu3.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 26 Sep 2006 23:29:53 +0100
+
 ubiquity (1.1.23) edgy; urgency=low
 
   * Move /etc/default/console-setup aside before running the keyboard
diff -Nru /tmp/8FP7uVGNPK/ubiquity-1.1.23/debian/control /tmp/Z0Xd6eGPFL/ubiquity-1.1.24/debian/control
--- /tmp/8FP7uVGNPK/ubiquity-1.1.23/debian/control	2006-09-25 13:09:08.000000000 +0100
+++ /tmp/Z0Xd6eGPFL/ubiquity-1.1.24/debian/control	2006-09-26 23:24:24.000000000 +0100
@@ -8,7 +8,7 @@
 
 Package: ubiquity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf (>= 1.4.72ubuntu5), ubiquity-frontend-${source:Version}, ubiquity-artwork-${source:Version}, laptop-detect, lsb-release, ubiquity-casper, python-apt (>= 0.6.16.2ubuntu4), console-setup, iso-codes, passwd, adduser, os-prober, ${bootloader-depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf (>= 1.4.72ubuntu5), ubiquity-frontend-${source:Version}, ubiquity-artwork-${source:Version}, laptop-detect, lsb-release, ubiquity-casper, python-apt (>= 0.6.16.2ubuntu4), console-setup (>= 1.7ubuntu12), iso-codes, passwd, adduser, os-prober, ${bootloader-depends}
 Conflicts: ubuntu-express, espresso, espresso-utils, espresso-locale, espresso-keyboard-setup, espresso-kbd-chooser, espresso-timezone, user-setup (<< 0.05ubuntu6), partman, espresso-grub, espresso-yaboot
 Replaces: ubuntu-express, espresso, espresso-utils, espresso-locale, espresso-keyboard-setup, espresso-kbd-chooser, espresso-timezone, user-setup (<< 0.05ubuntu6), partman, espresso-grub, espresso-yaboot, ubiquity-frontend-gtk (<< 0.99.82)
 XB-Python-Version: ${python:Versions}
diff -Nru /tmp/8FP7uVGNPK/ubiquity-1.1.23/ubiquity/components/console_setup.py /tmp/Z0Xd6eGPFL/ubiquity-1.1.24/ubiquity/components/console_setup.py
--- /tmp/8FP7uVGNPK/ubiquity-1.1.23/ubiquity/components/console_setup.py	2006-09-23 08:40:46.000000000 +0100
+++ /tmp/Z0Xd6eGPFL/ubiquity-1.1.24/ubiquity/components/console_setup.py	2006-09-26 22:57:36.000000000 +0100
@@ -44,6 +44,11 @@
                 os.unlink('/etc/default/console-setup')
             except OSError:
                 pass
+        # Make sure debconf doesn't do anything with crazy "preseeded"
+        # answers to these questions. If you want to preseed these, use the
+        # *code variants.
+        self.db.fset('console-setup/layout', 'seen', 'false')
+        self.db.fset('console-setup/variant', 'seen', 'false')
 
         # Technically we should provide a version as the second argument,
         # but that isn't currently needed and it would require querying