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 /sysutils/nut | |
| 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 'sysutils/nut')
| -rw-r--r-- | sysutils/nut/files/nut.sh.in | 2 | ||||
| -rw-r--r-- | sysutils/nut/files/nut_upslog.sh.in | 2 | ||||
| -rw-r--r-- | sysutils/nut/files/nut_upsmon.sh.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sysutils/nut/files/nut.sh.in b/sysutils/nut/files/nut.sh.in index 1aa66a56732f..98ba6394389c 100644 --- a/sysutils/nut/files/nut.sh.in +++ b/sysutils/nut/files/nut.sh.in @@ -21,7 +21,7 @@ nut_prefix=${nut_prefix-"%%PREFIX%%"} . /etc/rc.subr name="nut" -rcvar=`set_rcvar` +rcvar=nut_enable load_rc_config $name diff --git a/sysutils/nut/files/nut_upslog.sh.in b/sysutils/nut/files/nut_upslog.sh.in index 84b32b413af8..9bb361e1d3be 100644 --- a/sysutils/nut/files/nut_upslog.sh.in +++ b/sysutils/nut/files/nut_upslog.sh.in @@ -24,7 +24,7 @@ nut_upslog_ups=${nut_upslog_ups-"myups@localhost"} . /etc/rc.subr name="nut_upslog" -rcvar=`set_rcvar` +rcvar=nut_upslog_enable load_rc_config $name diff --git a/sysutils/nut/files/nut_upsmon.sh.in b/sysutils/nut/files/nut_upsmon.sh.in index e1836ac174c1..6aee6a46c900 100644 --- a/sysutils/nut/files/nut_upsmon.sh.in +++ b/sysutils/nut/files/nut_upsmon.sh.in @@ -21,7 +21,7 @@ nut_upsmon_prefix=${nut_upsmon_prefix-"%%PREFIX%%"} . /etc/rc.subr name="nut_upsmon" -rcvar=`set_rcvar` +rcvar=nut_upsmon_enable load_rc_config $name |