diff options
author | dougb <dougb@FreeBSD.org> | 2012-01-14 16:57:23 +0800 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2012-01-14 16:57:23 +0800 |
commit | 4500e6f95eef76996051b447f00584b31e4abedf (patch) | |
tree | aa85e69ac86658b87b78e09ff440d65dc0ff7518 /misc | |
parent | 9b5808c5a6c860e753267e93e9516b3301002f03 (diff) | |
download | freebsd-ports-gnome-4500e6f95eef76996051b447f00584b31e4abedf.tar.gz freebsd-ports-gnome-4500e6f95eef76996051b447f00584b31e4abedf.tar.zst freebsd-ports-gnome-4500e6f95eef76996051b447f00584b31e4abedf.zip |
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.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/dahdi-kmod/files/dahdi.in | 2 | ||||
-rw-r--r-- | misc/dnetc/files/dnetc.sh.in | 2 | ||||
-rw-r--r-- | misc/e2fsprogs-libuuid/files/uuidd.in | 2 | ||||
-rw-r--r-- | misc/proxyper/files/proxyper.in | 2 | ||||
-rw-r--r-- | misc/upclient/files/upclient.sh.in | 2 | ||||
-rw-r--r-- | misc/yaunc/files/yaunc.sh.in | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/misc/dahdi-kmod/files/dahdi.in b/misc/dahdi-kmod/files/dahdi.in index 471a627e167f..7c192566cd76 100644 --- a/misc/dahdi-kmod/files/dahdi.in +++ b/misc/dahdi-kmod/files/dahdi.in @@ -34,7 +34,7 @@ . /etc/rc.subr name="dahdi" -rcvar=`set_rcvar` +rcvar=dahdi_enable start_cmd="dahdi_start" stop_cmd="dahdi_stop" diff --git a/misc/dnetc/files/dnetc.sh.in b/misc/dnetc/files/dnetc.sh.in index 9ffaee657249..25d083b6a0ae 100644 --- a/misc/dnetc/files/dnetc.sh.in +++ b/misc/dnetc/files/dnetc.sh.in @@ -18,7 +18,7 @@ . /etc/rc.subr name="dnetc" -rcvar=`set_rcvar` +rcvar=dnetc_enable load_rc_config $name diff --git a/misc/e2fsprogs-libuuid/files/uuidd.in b/misc/e2fsprogs-libuuid/files/uuidd.in index 2178770dd6a8..0becd42f67b0 100644 --- a/misc/e2fsprogs-libuuid/files/uuidd.in +++ b/misc/e2fsprogs-libuuid/files/uuidd.in @@ -16,7 +16,7 @@ . /etc/rc.subr name="uuidd" -rcvar=`set_rcvar` +rcvar=uuidd_enable command="%%PREFIX%%/sbin/uuidd" procname="${command}" diff --git a/misc/proxyper/files/proxyper.in b/misc/proxyper/files/proxyper.in index 547585fc83eb..90667a32b351 100644 --- a/misc/proxyper/files/proxyper.in +++ b/misc/proxyper/files/proxyper.in @@ -14,7 +14,7 @@ user="nobody" . /etc/rc.subr name="proxyper" -rcvar=`set_rcvar` +rcvar=proxyper_enable pidfile=${dir}/rc5desproxy.pid required_files=${dir}/${name}.ini diff --git a/misc/upclient/files/upclient.sh.in b/misc/upclient/files/upclient.sh.in index 6cef94df2b5f..0f18a952fd37 100644 --- a/misc/upclient/files/upclient.sh.in +++ b/misc/upclient/files/upclient.sh.in @@ -34,7 +34,7 @@ upclient_enable="${upclient_enable-NO}" . /etc/rc.subr name=upclient -rcvar=$(set_rcvar) +rcvar=upclient_enable # private configfile=%%PREFIX%%/etc/${name}.conf diff --git a/misc/yaunc/files/yaunc.sh.in b/misc/yaunc/files/yaunc.sh.in index 6643e13dbe21..6282064c6191 100644 --- a/misc/yaunc/files/yaunc.sh.in +++ b/misc/yaunc/files/yaunc.sh.in @@ -14,7 +14,7 @@ . /etc/rc.subr name="yaunc" -rcvar=${name}_enable +rcvar=yaunc_enable command=%%PREFIX%%/bin/${name} |