[SCM] live-helper branch, debian, updated. debian/2.0_a6-1-14-ge0c86ca
Daniel Baumann
daniel at debian.org
Wed Feb 17 11:35:36 UTC 2010
The following commit has been merged in the debian branch:
commit 5884164e7921a62e0c07de45f6abb3501e8683be
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Feb 14 15:43:47 2010 +0100
Calling /usr/sbin/chroot with full path in Chroot(); should fix path problems when using live-helper from a local source tree.
diff --git a/functions/chroot.sh b/functions/chroot.sh
index e3af0c2..ba93bf7 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -17,10 +17,10 @@ Chroot ()
if [ "${LH_USE_FAKEROOT}" != "true" ]
then
- ${LH_ROOT_COMMAND} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTP_PROXY}" http_proxy="${LH_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS}
+ ${LH_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTP_PROXY}" http_proxy="${LH_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS}
else
# Building with fakeroot/fakechroot
- ${LH_ROOT_COMMAND} chroot "${CHROOT}" ${COMMANDS}
+ ${LH_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" ${COMMANDS}
fi
return "${?}"
--
live-helper
More information about the debian-live-changes
mailing list