[SCM] live-build branch, debian, updated. debian/3.0_a25-1-57-g6167d10

Daniel Baumann daniel at debian.org
Thu Aug 4 19:53:17 UTC 2011


The following commit has been merged in the debian branch:
commit 968be1f426e442f9545fc08e7ede617525e6307f
Author: Cody A.W. Somerville <cody.somerville at canonical.com>
Date:   Wed Jul 20 08:54:54 2011 +0200

    Appending 'linux32' to LB_ROOT_COMMAND if 'uname -m' is x86_64 and LB_ARCHITECTURE is i386.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 78c39e6..75136f1 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -217,6 +217,11 @@ Set_defaults ()
 		fi
 	fi
 
+	if [ "${LB_ARCHITECTURE}" = "i386" ] && [ "$(uname -m)" = "x86_64" ]
+	then
+		LB_ROOT_COMMAND="${LB_ROOT_COMMAND} linux32"
+	fi
+
 	# Setting tasksel
 	case "${LB_DISTRIBUTION}" in
 		squeeze)

-- 
live-build



More information about the debian-live-changes mailing list