Merge lp:~serge-hallyn/ubuntu/maverick/casper/no-panic-on-mount-fail into lp:ubuntu/natty/casper

[Colin Watson]

If trying to mount a block device while aimlessly snooping around,
don't panic if it fails. The reason that is problematic is that
multipath may hold /dev/sd?? busy. Casper can proceed just fine
without snooping on the busy disks, but panics on mount failure
(with -EBUSY) anyway.

[Colin Watson (cjwatson)]

Resubmitting against natty.

=== modified file 'bin/casper-snapshot'
--- bin/casper-snapshot	2009-06-12 11:46:49 +0000
+++ bin/casper-snapshot	2010-11-29 12:38:25 +0000
@@ -215,7 +215,7 @@
 		fi
 	else
 		if [ -b "${dev}" ] ; then
-			try_mount "${dev}" "${MOUNTP}" rw
+			try_mount "${dev}" "${MOUNTP}" rw || panic "failed to mount ${dev}"
 		fi
 	fi
 }
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-11-29 12:36:32 +0000
+++ debian/changelog	2010-11-29 12:38:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 casper (1.249) UNRELEASED; urgency=low
 
   * Add universal access preferences taskbar icon in all accessibility
@@ -67,6 +68,16 @@
 
  -- Jonathan Riddell <[e-mail]>  Mon, 06 Sep 2010 14:20:54 +0100
 
+=======
+casper (1.241ubuntu1) maverick; urgency=low
+
+  * change scripts/casper-helpers:try_mount() to not panic when regular
+    mounts fail.  Instead, return an error code so the caller can decide.
+    (LP: #624632)
+
+ -- Serge Hallyn <[e-mail]>  Fri, 03 Sep 2010 15:00:44 -0500
+
+>>>>>>> MERGE-SOURCE
 casper (1.241) maverick; urgency=low
 
   [ Mathieu Trudel-Lapierre ]
 
=== modified file 'scripts/casper-helpers'
--- scripts/casper-helpers	2010-09-06 15:52:21 +0000
+++ scripts/casper-helpers	2010-11-29 12:38:25 +0000
@@ -164,6 +164,9 @@
     fi
 }
 
+# Returns 0 on success
+# panics if remount- or bind-mount fails
+# returns 1 on failure otherwise
 try_mount ()
 {
     dev="${1}"
@@ -171,12 +174,20 @@
     opts="${3}"
 
     if where_is_mounted ${dev} > /dev/null; then
-    if [ "${opts}" != "ro" ]; then
-        mount -o remount,"${opts}" ${dev} $(where_is_mounted ${dev}) || panic "Remounting failed"
-    fi
+        if [ "${opts}" != "ro" ]; then
+            mount -o remount,"${opts}" ${dev} $(where_is_mounted ${dev}) || panic "Remounting failed"
+            return 0
+        fi
         mount -o bind $(where_is_mounted ${dev}) ${mountp} || panic "Cannot bind-mount"
+        return 0
     else
-        mount -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}"
+        mount -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}"
+        ret=$?
+        if [ $ret -ne 0 ]; then
+            log_warning_msg "Cannot mount ${dev} on ${mountp}"
+            return 1
+        fi
+        return 0
     fi
 }
 
@@ -202,9 +213,15 @@
             # where filesystems are in use by hibernated operating systems.
             elif [ "$(get_fstype ${devname})" = "vfat" ]; then
                 mkdir -p "${cow_backing}"
+<<<<<<< TREE
                 try_mount "${devname}" "${cow_backing}" "rw"
                 if [ -e "${pers_fpath}" ]; then
                     echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*")
+=======
+                try_mount "${devname}" "${cow_backing}" "rw" || continue
+                if [ -e "${cow_backing}/${pers_label}" ]; then
+                    echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
+>>>>>>> MERGE-SOURCE
                     return 0
                 else
                     umount ${cow_backing}
@@ -226,7 +243,7 @@
             devfstype="$(get_fstype ${devname})"
             if [ "${devfstype}" = "vfat" ] ||  [ "${devfstype}" = "ext2" ] ; then # FIXME: all supported block devices should be scanned
                 mkdir -p "${snap_backing}"
-                try_mount "${devname}" "${snap_backing}" "ro"
+                try_mount "${devname}" "${snap_backing}" "ro" || continue
                 for filename in ${filenames}; do
                     if [ -e "${snap_backing}/${filename}" ]; then
                         echo "${devname} ${snap_backing} ${filename}"