merging trunk r3743 r3744
This commit is contained in:
parent
199132680a
commit
adc85de5af
3 changed files with 7 additions and 4 deletions
|
@ -479,7 +479,7 @@ mk_SETUP:
|
||||||
|
|
||||||
mk_LUSER: mk_SETUP
|
mk_LUSER: mk_SETUP
|
||||||
@\$(call echo_SULUSER_request)
|
@\$(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
|
@sudo make restore-luser-env
|
||||||
@touch \$@
|
@touch \$@
|
||||||
|
|
||||||
|
|
7
README
7
README
|
@ -67,9 +67,12 @@ $Id$
|
||||||
If you accepted the displayed settings jhalfs will proceed to create the
|
If you accepted the displayed settings jhalfs will proceed to create the
|
||||||
Makefile, optionally download packages.
|
Makefile, optionally download packages.
|
||||||
|
|
||||||
::NEWS::
|
IMPORTANT::
|
||||||
You must be logged as a normal user with sudo privileges to run
|
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::
|
NOTE::
|
||||||
If you run the jhalfs script directly the only function you can select
|
If you run the jhalfs script directly the only function you can select
|
||||||
|
|
|
@ -36,7 +36,7 @@ crLOGDIR = /\$(SCRIPT_ROOT)/$LOGDIRBASE
|
||||||
crTESTLOGDIR = /\$(SCRIPT_ROOT)/$TESTLOGDIRBASE
|
crTESTLOGDIR = /\$(SCRIPT_ROOT)/$TESTLOGDIRBASE
|
||||||
crFILELOGDIR = /\$(SCRIPT_ROOT)/$FILELOGDIRBASE
|
crFILELOGDIR = /\$(SCRIPT_ROOT)/$FILELOGDIRBASE
|
||||||
|
|
||||||
SU_LUSER = su - \$(LUSER) -c
|
SU_LUSER = sudo -u \$(LUSER) -i sh -c
|
||||||
LUSER_HOME = \$(LHOME)/\$(LUSER)
|
LUSER_HOME = \$(LHOME)/\$(LUSER)
|
||||||
PRT_DU = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found \$(MOUNT_PT) \`\n"
|
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"
|
PRT_DU_CR = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found / \`\n"
|
||||||
|
|
Reference in a new issue