summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@debian.org>2009-07-22 15:09:27 +0000
committerOtavio Salvador <otavio@debian.org>2009-07-22 15:09:27 +0000
commitcc2786d9dadf108f067554ed908307611e954859 (patch)
tree2cbed6ade3413b62478cc211d701eee6a44c6861 /functions
parent1a5b695b4e2334cbd6746b200aa78e863a591e54 (diff)
downloaddebootstrap-cc2786d9dadf108f067554ed908307611e954859.tar.gz
Apply patch from Riku Voipio <riku.voipio@iki.fi> to add support for scratchbox variant. Closes: #536820.
r59598
Diffstat (limited to 'functions')
-rw-r--r--functions6
1 files changed, 3 insertions, 3 deletions
diff --git a/functions b/functions
index 2aecd5d..ae8fd3f 100644
--- a/functions
+++ b/functions
@@ -730,7 +730,7 @@ extract () { (
); }
in_target_nofail () {
- if ! chroot "$TARGET" "$@" 2>/dev/null; then
+ if ! $CHROOT_CMD "$@" 2>/dev/null; then
true
fi
return 0
@@ -741,7 +741,7 @@ in_target_failmsg () {
local msg="$2"
local arg="$3"
shift; shift; shift
- if ! chroot "$TARGET" "$@"; then
+ if ! $CHROOT_CMD "$@"; then
warning "$code" "$msg" "$arg"
return 1
fi
@@ -749,7 +749,7 @@ in_target_failmsg () {
}
in_target () {
- in_target_failmsg IN_TARGET_FAIL "Failure trying to run: %s" "chroot $TARGET $*" "$@"
+ in_target_failmsg IN_TARGET_FAIL "Failure trying to run: %s" "$CHROOT_CMD $*" "$@"
}
###################################################### standard setup stuff