[SCM] live-build branch, debian-next, updated. debian/3.0_a48-1-7-g10c79ed
Daniel Baumann
daniel at debian.org
Thu May 31 11:19:42 UTC 2012
The following commit has been merged in the debian-next branch:
commit 10c79ed504fc1fe59abe7f21c752d3da8b5e7f6f
Author: Daniel Baumann <daniel at debian.org>
Date: Thu May 31 13:19:36 2012 +0200
Removing pre-squeeze XORG_CONFIG variable from the chroot environment.
diff --git a/functions/chroot.sh b/functions/chroot.sh
index 198f15f..4d1d989 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -25,7 +25,7 @@ Chroot ()
if [ "${LB_USE_FAKEROOT}" != "true" ]
then
- ${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LB_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${ENV} ${COMMANDS}
+ ${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LB_DEBCONF_NOWARNINGS}" ${ENV} ${COMMANDS}
else
# Building with fakeroot/fakechroot
${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" ${ENV} ${COMMANDS}
--
live-build
More information about the debian-live-changes
mailing list