diff -Nru /tmp/iNpmkC6caE/ubiquity-1.2.5/debian/changelog /tmp/YhiBOD9zl7/ubiquity-1.2.6~prop1/debian/changelog
--- /tmp/iNpmkC6caE/ubiquity-1.2.5/debian/changelog	2006-10-20 23:45:13.000000000 +0100
+++ /tmp/YhiBOD9zl7/ubiquity-1.2.6~prop1/debian/changelog	2007-01-02 14:49:20.000000000 +0000
@@ -1,3 +1,11 @@
+ubiquity (1.2.6~prop1) edgy-proposed; urgency=low
+
+  * Fix mount point validation to avoid accidentally skipping a number of
+    checks on pre-existing partitions, including the "is there a root file
+    system?" check (LP: #67130).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue,  2 Jan 2007 14:49:18 +0000
+
 ubiquity (1.2.5) edgy; urgency=low
 
   * Automatic update of included source packages: apt-setup 1:0.11ubuntu5,
diff -Nru /tmp/iNpmkC6caE/ubiquity-1.2.5/ubiquity/validation.py /tmp/YhiBOD9zl7/ubiquity-1.2.6~prop1/ubiquity/validation.py
--- /tmp/iNpmkC6caE/ubiquity-1.2.5/ubiquity/validation.py	2006-10-16 15:10:13.000000000 +0100
+++ /tmp/YhiBOD9zl7/ubiquity-1.2.6~prop1/ubiquity/validation.py	2007-01-02 14:04:37.000000000 +0000
@@ -114,10 +114,6 @@
         if path == 'newworld':
             result.remove(MOUNTPOINT_NONEWWORLD)
             continue
-        elif fstype is None:
-            # Some other special-purpose partition we don't know about for
-            # whatever reason.
-            continue
 
         if path == '/':
             root = True
@@ -125,13 +121,14 @@
         elif '/'.join(path.split('/')[:2]) in ('/boot', '/usr', '/var'):
             root_size += float(size[device.split('/')[2]])
 
-        if path != 'swap' and path in seen_mountpoints:
-            result.add(MOUNTPOINT_DUPPATH)
-        else:
-            seen_mountpoints.add(path)
-        regex = re.compile(r'^[a-zA-Z0-9/\-\_\+]+$')
-        if not regex.search(path):
-            result.add(MOUNTPOINT_BADCHAR)
+        if path.startswith('/'):
+            if path in seen_mountpoints:
+                result.add(MOUNTPOINT_DUPPATH)
+            else:
+                seen_mountpoints.add(path)
+            regex = re.compile(r'^[a-zA-Z0-9/\-\_\+]+$')
+            if not regex.search(path):
+                result.add(MOUNTPOINT_BADCHAR)
 
         if fstype == 'xfs':
             if path == '/':
@@ -139,7 +136,7 @@
             elif path == '/boot':
                 xfs_boot = True
 
-        if not format:
+        if path.startswith('/') and not format:
             pathtop = '/'.join(path.split('/')[:2])
             if (pathtop in ('/', '/boot', '/usr', '/var') and
                 path not in ('/usr/local', '/var/local')):