summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-11-10 18:39:49 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:28 +0100
commitba83790488c83520e656a71003147bda45a8c6f5 (patch)
tree3bf6760140cc4af0264925a1d865a7025392692d /functions
parentee91e98161fcd14e1c28f659357d33e9fda7019b (diff)
downloadvyos-live-build-ba83790488c83520e656a71003147bda45a8c6f5.tar.gz
vyos-live-build-ba83790488c83520e656a71003147bda45a8c6f5.zip
Adding option to allow building in fakeroot/fakechroot environment, thanks to An-Cheng Huang <ancheng@vyatta.com>.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/chroot.sh9
-rwxr-xr-xfunctions/defaults.sh3
2 files changed, 11 insertions, 1 deletions
diff --git a/functions/chroot.sh b/functions/chroot.sh
index ca48e0047..17c5f3664 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -15,7 +15,14 @@ Chroot ()
# Executing commands in chroot
Echo_debug "Executing: ${COMMANDS}"
- ${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}
+
+ if [ "${LH_USE_FAKEROOT}" != "enabled" ]
+ 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}
+ else
+ # Building with fakeroot/fakechroot
+ ${LH_ROOT_COMMAND} chroot chroot ${COMMANDS}
+ fi
return "${?}"
}
diff --git a/functions/defaults.sh b/functions/defaults.sh
index c389a6c52..cc0747a20 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -590,4 +590,7 @@ Set_defaults ()
# Setting image type
LH_SOURCE_IMAGES="${LH_SOURCE_IMAGES:-tar}"
+
+ # Setting fakeroot/fakechroot
+ LH_USE_FAKEROOT="${LH_USE_FAKEROOT:-disabled}"
}