From ef32ce5ea5347fc818afcc6dc2bb6b52c712e336 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Fri, 1 Nov 2013 14:15:43 +0000
Subject: [PATCH] Getting mad because you cannot interrupt the build once
 started? The present set of commands seems to allow interrupting during the
 chapter 5 phase. No changes to chroot phase yet.

---
 LFS/master.sh                 | 2 +-
 common/libs/func_wrt_Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LFS/master.sh b/LFS/master.sh
index b29abf4..816ffde 100644
--- a/LFS/master.sh
+++ b/LFS/master.sh
@@ -479,7 +479,7 @@ mk_SETUP:
 
 mk_LUSER: mk_SETUP
 	@\$(call echo_SULUSER_request)
-	@( sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) LUSER" )
+	@( \$(SU_LUSER) "make -C \$(MOUNT_PT)/\$(SCRIPT_ROOT) BREAKPOINT=\$(BREAKPOINT) LUSER" )
 	@sudo make restore-luser-env
 	@touch \$@
 
diff --git a/common/libs/func_wrt_Makefile b/common/libs/func_wrt_Makefile
index 5ec77da..d5fff35 100644
--- a/common/libs/func_wrt_Makefile
+++ b/common/libs/func_wrt_Makefile
@@ -36,7 +36,7 @@ crLOGDIR       = /\$(SCRIPT_ROOT)/$LOGDIRBASE
 crTESTLOGDIR   = /\$(SCRIPT_ROOT)/$TESTLOGDIRBASE
 crFILELOGDIR   = /\$(SCRIPT_ROOT)/$FILELOGDIRBASE
 
-SU_LUSER       = su - \$(LUSER) -c
+SU_LUSER       = sudo -u \$(LUSER) -i sh -c
 LUSER_HOME     = \$(LHOME)/\$(LUSER)
 PRT_DU         = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found \$(MOUNT_PT) \`\n"
 PRT_DU_CR      = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found / \`\n"