From b4c51c0c3d58f7065997849f8aef6c959b1f8f2c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 22 Nov 2008 16:49:41 +0100 Subject: [PATCH] Merging casper 1.142. --- docs/ChangeLog.casper | 6 ++++++ scripts/live | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index ae7c735..afa19e2 100644 --- 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 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 --- 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}")