Merge lp:~tormodvolden/casper/excessive-mounting into lp:casper

[Tormod Volden]

=== modified file 'debian/changelog'
--- debian/changelog	2009-09-02 13:55:00 +0000
+++ debian/changelog	2009-09-04 17:11:34 +0000
@@ -1,3 +1,10 @@
+casper (1.190) karmic; urgency=low
+
+  * do not remount filesystems that already have been probed when
+    searching for the livefs (LP: 424464)
+
+ -- Tormod Volden <[e-mail]>  Fri, 04 Sep 2009 19:07:05 +0200
+
 casper (1.189) karmic; urgency=low
 
   * In 10adduser fix path to ubiquity-kde.desktop file

=== modified file 'scripts/casper'
--- scripts/casper	2009-08-31 12:15:55 +0000
+++ scripts/casper	2009-09-03 23:56:25 +0000
@@ -18,6 +18,7 @@
 BUILD_SYSTEM=Custom
 
 mkdir -p $mountpoint
+tried=/tmp/tried
 
 [ -f /etc/casper.conf ] && . /etc/casper.conf
 export USERNAME USERFULLNAME HOST BUILD_SYSTEM
@@ -506,7 +507,10 @@
 
     fstype=$(get_fstype "${devname}")
     if is_supported_fs ${fstype}; then
+        devuid=$(blkid -o value -s UUID "$devname")
+        [ -n "$devuid" ] && grep -qs "\<$devuid\>" $tried && continue
         mount -t ${fstype} -o ro,noatime "${devname}" $mountpoint || continue
+        [ -n "$devuid" ] && echo "$devuid" >> $tried
         if is_casper_path $mountpoint && \
            ([ "$skip_uuid_check" ] || matches_uuid $mountpoint); then
             echo $mountpoint