diff options
author | flz <flz@FreeBSD.org> | 2006-08-22 11:17:29 +0000 |
---|---|---|
committer | flz <flz@FreeBSD.org> | 2006-08-22 11:17:29 +0000 |
commit | 54b7b1d84ef94edba4668e1a3eb0ae3f5af47ddf (patch) | |
tree | 83b9d9ba19106202890ea4e049a6ed5c3c9d6ea0 /share | |
parent | 0c8554603327db9744c6c76b143eedd695c14561 (diff) | |
download | FreeBSD-src-54b7b1d84ef94edba4668e1a3eb0ae3f5af47ddf.zip FreeBSD-src-54b7b1d84ef94edba4668e1a3eb0ae3f5af47ddf.tar.gz |
Backout this commit since it breaks startup and some scripts in
certain conditions. I haven't been able to find a better solution yet:
- Set a two read-only variables (${prefix} and ${etcdir}). This is
especially useful when using /etc/rc.d scripts with third-party
software installed from ports.
- Fix rc.d/sshd to work with openssh from ports using ${etcdir}
instead of hardcoded /etc.
- Reflect prefix/etcdir changes in rc.subr.8.
src/etc/rc.d/sshd: rev 1.9 -> 1.10
src/etc/rc.subr: rev 1.51 -> 1.52
src/share/man/man8/rc.subr.8: rev 1.11 -> 1.12
Approved by: cperciva (mentor)
Diffstat (limited to 'share')
-rw-r--r-- | share/man/man8/rc.subr.8 | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index f6441ea..3bec150 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -332,38 +332,12 @@ which is not always the case. Source in the configuration files for .Ar name . First, -.Pa /etc/defaults/rc.conf -and .Pa /etc/rc.conf -are sourced if they have not yet been read in. +is sourced if it has not yet been read in. Then, -.Va etcdir -is set to -.Pa /etc -if -.Va command Ap s -prefix (or -.Va ${name} Ns Va _program Ap s -if it is defined) is -.Pa / -or -.Pa /usr , -otherwise -.Va etcdir -is set to -.Pa ${prefix} Ns Pa /etc . -Once those variables are set accordingly, -.Pa /etc/rc.conf.d/ Ns Va ${name} -is sourced if the file exists (but it is deprecated if -.Va etcdir -is different than -.Pa /etc ) -and then -.Pa ${etcdir} Ns Pa /defaults/ Ns Va ${name} -and -.Va ${etcdir} Ns Pa /rc.conf.d/ Ns Va ${name} -are sourced if these files exist. -All these files may also contain other variable assignments to override +.Pa /etc/rc.conf.d/ Ns Ar name +is sourced if it is an existing file. +The latter may also contain other variable assignments to override .Ic run_rc_command arguments defined by the calling script, to provide an easy mechanism for an administrator to override the behaviour of a given |