[SCM] live-config branch, debian-next, updated. debian/3.0.2-1-4-g9b8347b

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 0c973aeb5623a93e128fdb233323c4808326e207
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 14 12:20:41 2012 +0200

    Using consistent line breaks in alternative conditionals.

diff --git a/scripts/config/0020-hostname b/scripts/config/0020-hostname
index 11b7a11..799feb1 100755
--- a/scripts/config/0020-hostname
+++ b/scripts/config/0020-hostname
@@ -35,7 +35,8 @@ Hostname ()
 Configure_hostname ()
 {
 	# Change hostname only if it is not set
-	if [ ! -e /etc/hostname ] || grep -qs localhost\.localdomain /etc/hostname
+	if [ ! -e /etc/hostname ] || \
+	   grep -qs localhost\.localdomain /etc/hostname
 	then
 		echo "${LIVE_HOSTNAME}" > /etc/hostname
 	else
diff --git a/scripts/config/0190-upstart b/scripts/config/0190-upstart
index b21ae62..7493c2e 100755
--- a/scripts/config/0190-upstart
+++ b/scripts/config/0190-upstart
@@ -38,7 +38,8 @@ Configure_upstart ()
 	do
 		_TTY="$(basename ${_FILE} .conf)"
 
-		if [ -e /sbin/mingetty ] || grep -qs '^exec.*mingetty' "${_FILE}"
+		if [ -e /sbin/mingetty ] || \
+		   grep -qs '^exec.*mingetty' "${_FILE}"
 		then
 			# mingetty has autologin support
 			sed -i -e 's|^\(exec.*getty\) *\(--autologin *[^ ]* *\)*.*$|exec /sbin/mingetty --autologin '"${LIVE_USERNAME} ${_TTY}|g" "${_FILE}"

-- 
live-config