diff options
author | Doug Barton <dougb@FreeBSD.org> | 2009-07-15 16:56:10 +0000 |
---|---|---|
committer | Doug Barton <dougb@FreeBSD.org> | 2009-07-15 16:56:10 +0000 |
commit | 0175383f0a1f8b78ed514778532f0467a8ccc6dc (patch) | |
tree | 4c98b621f22bb861a40c6493c6ed7517f295f7f3 /net/dhcp6 | |
parent | - Chase security/gpgme update. (diff) |
Fix a few "bad example" problems in the rc.d scripts that have been
propogated by copy and paste.
1. Primarily the "empty variable" default assignment, which is mostly
${name}_flags="", but fix a few others as well.
2. Where they are not already documented, add the existence of the _flags
(or other deleted empties) option to the comments, and in some cases add
comments from scratch.
3. Replace things that look like:
prefix=%%PREFIX%%
command=${prefix}/sbin/foo
to just use %%PREFIX%%. In many cases the $prefix variable is only used
once, and in some cases it is not used at all.
4. In a few cases remove ${name}_flags from command_args
5. Remove a long-stale comment about putting the port's rc.d script in
/etc/rc.d (which is no longer necessary).
No PORTREVISION bumps because all of these changes are noops.
Notes
Notes:
svn path=/head/; revision=237892
Diffstat (limited to 'net/dhcp6')
-rw-r--r-- | net/dhcp6/files/dhcp6c.sh.in | 5 | ||||
-rw-r--r-- | net/dhcp6/files/dhcp6relay.sh.in | 3 | ||||
-rw-r--r-- | net/dhcp6/files/dhcp6s.sh.in | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/net/dhcp6/files/dhcp6c.sh.in b/net/dhcp6/files/dhcp6c.sh.in index a37fc52c3363..ce786553db40 100644 --- a/net/dhcp6/files/dhcp6c.sh.in +++ b/net/dhcp6/files/dhcp6c.sh.in @@ -28,14 +28,13 @@ name="dhcp6c" rcvar=${name}_enable -prefix="%%PREFIX%%" -command="${prefix}/sbin/${name}" +command="%%PREFIX%%/sbin/${name}" start_precmd="${name}_precmd" load_rc_config $name : ${dhcp6c_enable="NO"} -: ${dhcp6c_config="${prefix}/etc/${name}.conf"} +: ${dhcp6c_config="%%PREFIX%%/etc/${name}.conf"} : ${dhcp6c_pidfile="/var/run/${name}.pid"} required_files="${dhcp6c_config}" diff --git a/net/dhcp6/files/dhcp6relay.sh.in b/net/dhcp6/files/dhcp6relay.sh.in index f548ac28367c..3dff743fb82d 100644 --- a/net/dhcp6/files/dhcp6relay.sh.in +++ b/net/dhcp6/files/dhcp6relay.sh.in @@ -25,8 +25,7 @@ name="dhcp6relay" rcvar=${name}_enable -prefix=%%PREFIX%% -command=${prefix}/sbin/${name} +command=%%PREFIX%%/sbin/${name} start_precmd="${name}_precmd" load_rc_config $name diff --git a/net/dhcp6/files/dhcp6s.sh.in b/net/dhcp6/files/dhcp6s.sh.in index f31a405d8651..da1bb167fa5e 100644 --- a/net/dhcp6/files/dhcp6s.sh.in +++ b/net/dhcp6/files/dhcp6s.sh.in @@ -26,14 +26,13 @@ name="dhcp6s" rcvar=${name}_enable -prefix=%%PREFIX%% -command=${prefix}/sbin/${name} +command=%%PREFIX%%/sbin/${name} start_precmd="${name}_precmd" load_rc_config $name : ${dhcp6s_enable="NO"} -: ${dhcp6s_config="${prefix}/etc/${name}.conf"} +: ${dhcp6s_config="%%PREFIX%%/etc/${name}.conf"} required_files=${dhcp6s_config} command_args="-c ${dhcp6s_config} ${dhcp6s_flags} ${dhcp6s_interface}" |