Sophie

Sophie

distrib > Fedora > 20 > i386 > by-pkgid > 8dfebdd61c84df6d2f55b169d9ed0fb0 > files > 2

debootstrap-1.0.67-1.fc20.src.rpm

From 7b24162146dd763e80eb4da94a3a026120907270 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Tue, 29 Apr 2014 15:00:04 +0200
Subject: [PATCH 3/3] Fix PATH for chroots

We don't use /bin and /sbin anymore since we separated /usr
---
 functions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions b/functions
index 674d649..4e424de 100644
--- a/functions
+++ b/functions
@@ -891,7 +891,7 @@ extract () { (
 ); }
 
 in_target_nofail () {
-	if ! $CHROOT_CMD "$@" 2>/dev/null; then
+	if ! PATH=/bin:/usr/bin:/sbin:/usr/sbin $CHROOT_CMD "$@" 2>/dev/null; then
 		true
 	fi
 	return 0
@@ -902,7 +902,7 @@ in_target_failmsg () {
 	local msg="$2"
 	local arg="$3"
 	shift; shift; shift
-	if ! $CHROOT_CMD "$@"; then
+	if ! PATH=/bin:/usr/bin:/sbin:/usr/sbin $CHROOT_CMD "$@"; then
 		warning "$code" "$msg" "$arg"
 		# Try to point user at actual failing package.
 		msg="See %s for details"
-- 
1.9.3