Merging casper 1.132.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 6049444..4e17e6c 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,15 @@
+casper (1.132) intrepid; urgency=low
+
+  [ Colin Watson ]
+  * Switch default unionfs implementation to aufs.
+
+  [ Agostino Russo ]
+  * Do not scan only vfat volumes when looking for cow devices (LP: #230703)
+  * Allow casper to use a squashfs filesystem within an arbitrary path (LP:
+    #230716, #207137)
+
+ -- Evan Dandrea <evand@ubuntu.com>  Wed, 28 May 2008 15:01:30 -0400
+
 casper (1.131) hardy; urgency=low
 
   [ Luke Yelavich ]

diff --git a/scripts/live b/scripts/live
index 867d4f9..29832c9 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -556,20 +556,6 @@ is_nice_device ()
        return 1
 }
 
-is_supported_fs ()
-{
-       # FIXME: do something better like the scan of supported filesystems
-       fstype="${1}"
-
-       case ${fstype} in
-               vfat|iso9660|udf|ext2|ext3|ntfs|jffs2)
-                       return 0
-                       ;;
-       esac
-
-       return 1
-}
-
 copy_live_to ()
 {
        copyfrom="${1}"
@@ -1164,6 +1150,19 @@ check_dev ()
                devname="${loopdevname}"
        fi
 
+       if [ -d "${devname}" ]
+       then
+               mount -o bind "${devname}" $mountpoint || continue
+
+               if is_live_path $mountpoint
+               then
+                       echo $mountpoint
+                       return 0
+               else
+                       umount $mountpoint
+               fi
+       fi
+
        fstype=$(get_fstype "${devname}")
 
        if is_supported_fs ${fstype}

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 3c89c95..cc73aa3 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -29,6 +29,20 @@ subdevices ()
        echo ${r}
 }
 
+is_supported_fs ()
+{
+       # FIXME: do something better like the scan of supported filesystems
+       fstype="${1}"
+
+       case ${fstype} in
+               vfat|iso9660|udf|ext2|ext3|ntfs|jffs2)
+               return 0
+               ;;
+       esac
+
+       return 1
+}
+
 get_fstype ()
 {
        local FSTYPE
@@ -281,24 +295,22 @@ find_files ()
                        devname=$(sys2dev "${dev}")
                        devfstype="$(get_fstype ${devname})"
 
-                       case "${devfstype}" in
-                               vfat|ext2|ext3|jffs2)
-                                       # FIXME: all supported block devices should be scanned
-                                       mkdir -p "${snap_backing}"
-                                       try_mount "${devname}" "${snap_backing}" "ro"
+                       if is_supported_fs ${devfstype}
+                       then
+                               mkdir -p "${snap_backing}"
+                               try_mount "${devname}" "${snap_backing}" "ro"
 
-                                       for filename in ${filenames}
+                               for filename in ${filenames}
                                        do
-                                               if [ -f "${snap_backing}/${filename}" ]
-                                               then
-                                                       echo "${devname} ${snap_backing} ${filename}"
-                                                       return 0
-                                               fi
-                                       done
-
-                                       umount ${snap_backing}
-                                       ;;
-                       esac
+                                       if [ -f "${snap_backing}/${filename}" ]
+                                       then
+                                               echo "${devname} ${snap_backing} ${filename}"
+                                               return 0
+                                       fi
+                               done
+
+                               umount ${snap_backing}
+                       fi
                done
        done
 }