diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2012-01-14 08:57:23 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2012-01-14 08:57:23 +0000 |
| commit | 83eb2c37009874672764765ec3bf3b59286c7391 (patch) | |
| tree | a956ace1a4a1e10876d4c36f12af02bc9df6cb29 /shells | |
| parent | - fix build with gcc46 (diff) | |
In the rc.d scripts, change assignments to rcvar to use the
literal name_enable wherever possible, and ${name}_enable
when it's not, to prepare for the demise of set_rcvar().
In cases where I had to hand-edit unusual instances also
modify formatting slightly to be more uniform (and in
some cases, correct). This includes adding some $FreeBSD$
tags, and most importantly moving rcvar= to right after
name= so it's clear that one is derived from the other.
Notes
Notes:
svn path=/head/; revision=289156
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/scponly/files/scponlyc.in | 2 | ||||
| -rw-r--r-- | shells/wapsh/files/htshd.sh.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/shells/scponly/files/scponlyc.in b/shells/scponly/files/scponlyc.in index 28aa5f59d378..f094135b0908 100644 --- a/shells/scponly/files/scponlyc.in +++ b/shells/scponly/files/scponlyc.in @@ -19,7 +19,7 @@ scponlyc_shells="${scponlyc_shells:-/etc/shells}" scponlyc_passwd="${scponlyc_passwd:-/etc/passwd}" name="scponlyc" -rcvar=`set_rcvar` +rcvar=scponlyc_enable start_cmd="scponlyc_startcmd" stop_cmd="scponlyc_stopcmd" diff --git a/shells/wapsh/files/htshd.sh.in b/shells/wapsh/files/htshd.sh.in index f42acdc68957..9e1fe1762196 100644 --- a/shells/wapsh/files/htshd.sh.in +++ b/shells/wapsh/files/htshd.sh.in @@ -7,7 +7,7 @@ . /etc/rc.subr name="htshd" -rcvar=`set_rcvar` +rcvar=htshd_enable load_rc_config $name htshd_enable=${htshd_enable:-"NO"} |