[SCM] live-boot branch, debian-next, updated. debian/3.0_a22-1-25-gf885467

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit d8df882369aad68caf3ac39692e2196e932ef15b
Author: Tails developers <amnesia at boum.org>
Date:   Thu Nov 10 18:58:04 2011 +0100

    Fixing a "sh: bad number" when $offset is not passed to setup_loop().

diff --git a/scripts/live-helpers b/scripts/live-helpers
index b812979..bbed909 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -234,7 +234,7 @@ setup_loop ()
 				fi
 			fi
 
-			if [ 0 -lt "${offset}" ]
+			if [ -n "${offset}" ] && [ 0 -lt "${offset}" ]
 			then
 				options="${options} -o ${offset}"
 			fi

-- 
live-boot