[SCM] live-boot branch, debian-next, updated. debian/2.0_a4-1-10-g0dae82b

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 0dae82b452c9876090df73e12847081934722664
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jun 4 16:42:58 2010 +0200

    Correcting syntax error in networking bottom script.

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index e01acdf..871d8c0 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -71,7 +71,7 @@ EOF
 
 	done
 else
-	if [ -z "${NETBOOT}" || -n "${DHCP}" ]
+	if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
 	then
 		# default, dhcp assigned
 		method="dhcp"

-- 
live-boot