[SCM] live-build branch, debian-next, updated. debian/3.0_a7-1-6-g780b86a
Daniel Baumann
daniel at debian.org
Mon Nov 29 22:04:31 UTC 2010
The following commit has been merged in the debian-next branch:
commit 780b86aebf62a2c6ed03320827ff390b6b0ffb65
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Nov 29 23:04:05 2010 +0100
Applying slightly modified patch from Michael Hudson <michael.hudson at canonical.com> to make arguments in debootstrap calls more robust.
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index 2502888..c25a769 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -55,13 +55,13 @@ mkdir -p chroot
# Setting debootstrap options
if [ -n "${LB_ARCHITECTURE}" ]
then
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LB_ARCHITECTURE}"
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURE}"
fi
if [ "${LB_ARCHIVE_AREAS}" != "main" ]
then
# Modify archive areas to remove leading/trailing whitespaces and replace other whitepspace with commas
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components $(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')"
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components=$(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')"
fi
if [ -n "${LB_BOOTSTRAP_CONFIG}" ]
--
live-build
More information about the debian-live-changes
mailing list