Merging casper 1.142.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index ae7c735..afa19e2 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,9 @@
+casper (1.142) intrepid; urgency=low
+
+  * Fix syntax error introduced by is_nice_device regex fix.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 19 Sep 2008 02:30:59 +0100
+
 casper (1.141) intrepid; urgency=low
 
   [ Johannes Ballé ]

diff --git a/scripts/live b/scripts/live
index 846e10f..9b9a443 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -1369,7 +1369,7 @@ find_livefs ()
        fi
 
        # or do the scan of block devices
-       for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)"
+       for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
        do
                devname=$(sys2dev "${sysblock}")
                fstype=$(get_fstype "${devname}")