From 1c0ba2019ece868b7ec75090df31ab77b6087355 Mon Sep 17 00:00:00 2001 From: Matthew Veety Date: Mon, 7 Dec 2015 17:59:53 -0500 Subject: [PATCH] made sure that rcmain.local runs independent of the existence of $home/lib/profile. Documented /rc/lib/rcmain, /rc/lib/rcmain.local, $home/lib/profile in rc(1) and the first two in namespace(4) --- rc/lib/rcmain | 8 ++++---- sys/man/1/rc | 13 +++++++++++++ sys/man/4/namespace | 4 ++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/rc/lib/rcmain b/rc/lib/rcmain index e74d51365..575718512 100644 --- a/rc/lib/rcmain +++ b/rc/lib/rcmain @@ -16,17 +16,17 @@ if not{ } fn sigexit if(! ~ $#cflag 0){ - if(flag l && /bin/test -r $home/lib/profile){ + if(flag l){ if(/bin/test -r /rc/lib/rcmain.local) . /rc/lib/rcmain.local - . $home/lib/profile + if(/bin/test -r $home/lib/profile) . $home/lib/profile } status='' eval $cflag } if not if(flag i){ - if(flag l && /bin/test -r $home/lib/profile){ + if(flag l){ if(/bin/test -r /rc/lib/rcmain.local) . /rc/lib/rcmain.local - . $home/lib/profile + if(/bin/test -r $home/lib/profile) . $home/lib/profile } status='' if(! ~ $#* 0) . $* diff --git a/sys/man/1/rc b/sys/man/1/rc index 3aab3564b..e7c27bed3 100644 --- a/sys/man/1/rc +++ b/sys/man/1/rc @@ -973,6 +973,19 @@ as they are executed). .PD .SH SOURCE .B /sys/src/cmd/rc +.SH FILES +.TF $home/lib/profile +.TP +.B $home/lib/profile +the user's local rc start script +.TF /rc/lib/rcmain +.TP +.B /rc/lib/rcmain +System rc start script +.TF /rc/lib/rcmain.local +.TP +.B /rc/lib/rcmain.local +Site specific system rc start script .SH "SEE ALSO" Tom Duff, ``Rc \- The Plan 9 Shell''. diff --git a/sys/man/4/namespace b/sys/man/4/namespace index 70c0c5826..3df229542 100644 --- a/sys/man/4/namespace +++ b/sys/man/4/namespace @@ -153,6 +153,10 @@ Directory of shell libraries. Startup code for .IR rc (1). .TP +.B /rc/lib/rcmain.local +Site local startup code for +.IR rc (1). +.TP .B /lib Collections of data, generally not parts of programs. .TP