From 40c5cf8d4af678bded1e27a567d149f45cf54d19 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 14 Feb 2010 15:43:47 +0100
Subject: Calling /usr/sbin/chroot with full path in Chroot(); should fix path
problems when using live-helper from a local source tree.
---
functions/chroot.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 "${?}"
--
cgit v1.0