From adc85de5afb54eca24c4022c2284062d5300e30b Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Fri, 1 Nov 2013 14:25:30 +0000 Subject: [PATCH] merging trunk r3743 r3744 --- LFS/master.sh | 2 +- README | 7 +++++-- common/libs/func_wrt_Makefile | 2 +- 3 files changed, 7 insertions(+), 4 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/README b/README index d33cc83..317837a 100644 --- a/README +++ b/README @@ -67,9 +67,12 @@ $Id$ If you accepted the displayed settings jhalfs will proceed to create the Makefile, optionally download packages. - ::NEWS:: + IMPORTANT:: You must be logged as a normal user with sudo privileges to run - the Makefile. + the Makefile. Furthermore, you are supposed to have enough privilege + to become any user. If you are not bothered about security issues, + the entry for the user "jhalfs_user" in /etc/sudoers could be + jhalfs_user ALL=(ALL) NOPASSWD:ALL NOTE:: If you run the jhalfs script directly the only function you can select 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"