From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-874780-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 56CB059CAF
	for <garchives@archives.gentoo.org>; Tue,  5 Apr 2016 16:17:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 882CFE088A;
	Tue,  5 Apr 2016 16:17:53 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 3199EE088A
	for <gentoo-commits@lists.gentoo.org>; Tue,  5 Apr 2016 16:17:53 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 50A97340DC1
	for <gentoo-commits@lists.gentoo.org>; Tue,  5 Apr 2016 16:17:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id EE85E188
	for <gentoo-commits@lists.gentoo.org>; Tue,  5 Apr 2016 16:17:49 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org>
Message-ID: <1459873041.310d3b077dc6eb0f8501d35ebf95c15237269ea6.grobian@gentoo>
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
X-VCS-Repository: repo/proj/prefix
X-VCS-Files: scripts/bootstrap-prefix.sh
X-VCS-Directories: scripts/
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: 310d3b077dc6eb0f8501d35ebf95c15237269ea6
X-VCS-Branch: master
Date: Tue,  5 Apr 2016 16:17:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: d3693a6c-8b82-481f-b729-c9a8fdf5ad9e
X-Archives-Hash: 8d9404547d5c0a6a3bb987c276404d76

commit:     310d3b077dc6eb0f8501d35ebf95c15237269ea6
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 16:17:21 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 16:17:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=310d3b07

boostrap_stage3: don't need to set CONFIG_SHELL, it has a default

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 554b007..15c2300 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1279,9 +1279,9 @@ bootstrap_stage3() {
 	# Use $ROOT tools where possible from now on.
 	rm -f "${ROOT}"/bin/sh
 	ln -s bash "${ROOT}"/bin/sh
-	export CONFIG_SHELL="${ROOT}/bin/bash"
-	export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin"
+	unset CONFIG_SHELL
 	unset MAKEINFO
+	export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin"
 
 	# Build portage and dependencies.
 	pkgs=(