Merging casper 1.190.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index eaba700..061da26 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,17 @@
+casper (1.190) karmic; urgency=low
+
+  [ Colin Watson ]
+  * Don't produce an invalid sed program when trying to remove an applet
+    which isn't in the panel (LP: #406188).
+
+  [ Tormod Volden ]
+  * do not remount filesystems that already have been probed when
+    searching for the livefs (LP: #424464)
+  * Fix quoting in try_snap (LP: #424742).
+  * Silence error messages for non-existent device nodes (LP: #425159).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 07 Sep 2009 13:10:53 +0100
+
 casper (1.189) karmic; urgency=low
 
   * In 10adduser fix path to ubiquity-kde.desktop file

diff --git a/scripts/live b/scripts/live
index e73ee80..3bb31c9 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -20,6 +20,7 @@ USERFULLNAME="Live user"
 HOSTNAME="host"
 
 mkdir -p "${mountpoint}"
+tried="/tmp/tried"
 
 # Create /etc/mtab for debug purpose and future syncs
 if [ ! -d /etc ]
@@ -1563,6 +1564,7 @@ check_dev ()
                        umount $mountpoint
                fi
        fi
+       [ -e "$devname" ] || continue
 
        if [ -n "${LIVE_MEDIA_OFFSET}" ]
        then
@@ -1574,7 +1576,10 @@ check_dev ()
 
        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_live_path ${mountpoint} && \
                        ([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
@@ -1674,6 +1679,7 @@ find_livefs ()
        for sysblock in $devices_to_scan
        do
                devname=$(sys2dev "${sysblock}")
+               [ -e "$devname" ] || continue
                fstype=$(get_fstype "${devname}")
 
                if /lib/udev/cdrom_id ${devname} > /dev/null

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 3c51fa0..45d1aa1 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -57,6 +57,7 @@ remove_applet ()
        local line_no prior_line next_line
 
        line_no="$(grep -n "<string>$1</string>" /root/usr/share/gconf/defaults/05_panel-default-setup.entries | cut -f 1 -d :)"
+       [ "$line_no" ] || return
        prior_line="$((line_no-1))"
        next_line="$((line_no+1))"