Merge lp:~jm-leddy/ubuntu/raring/lupin/fix-670096 into lp:ubuntu/raring/lupin

[James M. Leddy]

[Steve Langasek (vorlon)]

FYI, looking at this change, I don't think that just dropping the 'return 1' gives the correct results; if the mount failed, we don't want to then be trying to unmount something at the same target mount point. I think the below is correct instead:

=== modified file 'casper/scripts/lupin-helpers'
--- casper/scripts/lupin-helpers 2009-10-26 12:10:05 +0000
+++ casper/scripts/lupin-helpers 2013-05-14 03:31:25 +0000
@@ -56,7 +56,7 @@
                         unmount=false
                     else
                         mountpoint="${default_mountpoint}"
- try_mount "$devname" "$mountpoint" "$mountoptions" || return 1
+ try_mount "$devname" "$mountpoint" "$mountoptions" || continue
                         unmount=true
                     fi
                     if [ -e "${mountpoint}${path}" ]; then

I've merged this now into the saucy branch and will upload. Thanks!

review: Approve

[Sebastien Bacher (seb128)]

@Steve: hum, your review is marked as "approve" but your comment suggests "needs fixing", does it mean "ok to upload with || continue"?

[Steve Langasek (vorlon)]

Seb, it means I've made the changes locally and uploaded to saucy. This mp is targeted at raring so should probably be cancelled out, but of course I have no access to do that for an Ubuntu Branches mp. :/

[Sebastien Bacher (seb128)]

ah, that makes sense, that acl issue is annoying :/ I'm pinging people who can change the status

=== modified file 'casper/scripts/lupin-helpers'
--- casper/scripts/lupin-helpers	2009-10-26 12:10:05 +0000
+++ casper/scripts/lupin-helpers	2013-05-02 17:39:27 +0000
@@ -56,7 +56,7 @@
                         unmount=false                
                     else                
                         mountpoint="${default_mountpoint}"                    
-                        try_mount "$devname" "$mountpoint" "$mountoptions" || return 1
+                        try_mount "$devname" "$mountpoint" "$mountoptions"
                         unmount=true    		    
                     fi                
                     if [ -e "${mountpoint}${path}" ]; then

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-04 17:20:11 +0000
+++ debian/changelog	2013-05-02 17:39:27 +0000
@@ -1,3 +1,14 @@
+lupin (0.54) raring; urgency=low
+
+  * casper-premount/20iso-scan: Don't panice the system if try_mount
+    function returns error when it encount a CD/DVD device does not
+    have any meidum or a partition has a file system does not be
+    supported by kernel. This should not panic the system because the
+    target file could be in other devices. (LP: #670096)
+  * debian/control: bump standards version.
+
+ -- James M Leddy <[e-mail]>  Mon, 01 Apr 2013 01:57:18 -0400
+
 lupin (0.53) quantal; urgency=low
 
   * Only build lupin-support on architectures that also have grub-pc.

=== modified file 'debian/control'
--- debian/control	2012-10-04 17:20:11 +0000
+++ debian/control	2013-05-02 17:39:27 +0000
@@ -4,7 +4,7 @@
 Maintainer: Agostino Russo <[e-mail]>
 Uploaders: Colin Watson <[e-mail]>
 Build-Depends: debhelper (>= 7)
-Standards-Version: 3.7.2
+Standards-Version: 3.9.3
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-installer/lupin/hardy
 
 Package: lupin-casper