From aec44836a544902ccd1c23d8876c2cd988e81784 Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Mon, 26 Feb 2007 20:18:52 +0000
Subject: [PATCH] Fixed SHELL setting to work also when resuming failed builds.

---
 CLFS/master.sh                | 2 ++
 HLFS/master.sh                | 1 +
 LFS/master.sh                 | 1 +
 common/libs/func_wrt_Makefile | 7 ++-----
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CLFS/master.sh b/CLFS/master.sh
index c4be67c..6f9a534 100644
--- a/CLFS/master.sh
+++ b/CLFS/master.sh
@@ -824,6 +824,7 @@ mk_BLFS_TOOL: mk_CUSTOM_TOOLS
 SETUP:        $host_prep
 AS_LUSER:     $cross_tools $temptools
 SUDO:	      $orphan_scripts
+CHROOT_JAIL:  SHELL=/tools/bin/bash
 CHROOT_JAIL:  ${chroottools} $testsuitetools $basicsystem  $bootscripttools  $bootabletools
 CUSTOM_TOOLS: $custom_list
 BLFS_TOOL:    $blfs_tool
@@ -926,6 +927,7 @@ mk_BLFS_TOOL: mk_CUSTOM_TOOLS
 SETUP:        $host_prep
 AS_LUSER:     $cross_tools $temptools ${boottools}
 SUDO:	      $orphan_scripts
+AS_ROOT:      SHELL=/tools/bin/bash
 AS_ROOT:      $testsuitetools $basicsystem $bootscripttools $bootabletools
 CUSTOM_TOOLS: $custom_list
 BLFS_TOOL:    $blfs_tool
diff --git a/HLFS/master.sh b/HLFS/master.sh
index 1bada8c..c214a1d 100644
--- a/HLFS/master.sh
+++ b/HLFS/master.sh
@@ -597,6 +597,7 @@ mk_BLFS_TOOL: mk_CUSTOM_TOOLS
 SETUP:        $chapter3
 LUSER:        $chapter5
 SUDO:         $runasroot
+CHROOT:       SHELL=/tools/bin/bash
 CHROOT:       $chapter6
 BOOT:         $chapter7
 CUSTOM_TOOLS: $custom_list
diff --git a/LFS/master.sh b/LFS/master.sh
index 327ea7b..ab25eba 100644
--- a/LFS/master.sh
+++ b/LFS/master.sh
@@ -467,6 +467,7 @@ mk_BLFS_TOOL: mk_CUSTOM_TOOLS
 SETUP:        $chapter4
 LUSER:        $chapter5
 SUDO:         $runasroot
+CHROOT:       SHELL=/tools/bin/bash
 CHROOT:       $chapter6
 BOOT:         $chapter78
 CUSTOM_TOOLS: $custom_list
diff --git a/common/libs/func_wrt_Makefile b/common/libs/func_wrt_Makefile
index 35fb770..40572bd 100644
--- a/common/libs/func_wrt_Makefile
+++ b/common/libs/func_wrt_Makefile
@@ -14,11 +14,8 @@ wrt_Makefile_header() {            #
 #
 # Generated on `date "+%F %X %Z"`
 
-ifeq (\$(shell [ -x /bin/bash ] && echo /bin/bash),/bin/bash)
-  SHELL = /bin/bash
-else
-  SHELL = /tools/bin/bash
-endif
+
+SHELL = /bin/bash
 
 SRC            = /sources
 MOUNT_PT       = $BUILDDIR