=== modified file 'debian/changelog'
--- debian/changelog	2008-10-11 23:12:27 +0000
+++ debian/changelog	2008-10-14 06:47:44 +0000
@@ -1,3 +1,10 @@
+partman-target (55ubuntu5) UNRELEASED; urgency=low
+
+  * Only add the /cdrom mountpoint if the filesystem is iso9660
+    (LP: #150872).
+
+ -- Evan Dandrea <evand@ubuntu.com>  Tue, 14 Oct 2008 02:47:20 -0400
+
 partman-target (55ubuntu4) intrepid; urgency=low
 
   * Update Ubuntu-specific strings from Launchpad.

=== modified file 'finish.d/fstab_removable_media_entries'
--- finish.d/fstab_removable_media_entries	2008-03-03 21:42:42 +0000
+++ finish.d/fstab_removable_media_entries	2008-10-14 06:41:12 +0000
@@ -40,7 +40,8 @@
 	done
 }
 
-CDDEV=$(grep /cdrom /proc/mounts | cut -d ' ' -f 1 | grep -v ^/dev/loop)
+CDDEV=$(grep /cdrom /proc/mounts | cut -d ' ' -f 1 | grep -v ^/dev/loop | \
+	grep iso9660)
 if [ -n "$CDDEV" ]; then
 	MAPCDDEV=$(mapdevfs $CDDEV)
 else