From 494e64d35476b3d777e09b5c75c7f56d18f6f1a4 Mon Sep 17 00:00:00 2001 From: dougb Date: Wed, 15 Jul 2009 16:56:10 +0000 Subject: 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. --- net/isc-dhcp31-server/files/isc-dhcpd.in | 10 +++++----- net/isc-dhcp31-server/files/isc-dhcrelay.in | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'net/isc-dhcp31-server') diff --git a/net/isc-dhcp31-server/files/isc-dhcpd.in b/net/isc-dhcp31-server/files/isc-dhcpd.in index c1e482945ad2..b07255550367 100644 --- a/net/isc-dhcp31-server/files/isc-dhcpd.in +++ b/net/isc-dhcp31-server/files/isc-dhcpd.in @@ -22,9 +22,9 @@ load_rc_config ${name} # override these variables in /etc/rc.conf dhcpd_enable=${dhcpd_enable:-"NO"} -dhcpd_flags=${dhcpd_flags:-} # -q -early_chroot # command option(s) +# dhcpd_flags="" # -q -early_chroot # command option(s) +# dhcpd_ifaces="" # ethernet interface(s) dhcpd_conf=${dhcpd_conf:-%%PREFIX%%/etc/${name}.conf} # configuration file -dhcpd_ifaces=${dhcpd_ifaces:-} # ethernet interface(s) dhcpd_withumask=${dhcpd_withumask:-022} # file creation mask dhcpd_chuser_enable=${dhcpd_chuser_enable:-"%%PARANOIA%%"} # runs w/o privileges? @@ -35,12 +35,12 @@ dhcpd_chroot_enable=${dhcpd_chroot_enable:-"NO"} # runs chrooted? dhcpd_devfs_enable=${dhcpd_devfs_enable:-"YES"} # devfs if available? dhcpd_makedev_enable=${dhcpd_makedev_enable:-"NO"} # MAKEDEV instead of devfs? dhcpd_rootdir=${dhcpd_rootdir:-/var/db/${name}} # directory to run in -dhcpd_includedir=${dhcpd_includedir:-} # directory for included config files +# dhcpd_includedir="" # directory for included config files # untested dhcpd_jail_enable=${dhcpd_jail_enable:-"NO"} # runs imprisoned? -dhcpd_hostname=${dhcpd_hostname:-} # jail hostname -dhcpd_ipaddress=${dhcpd_ipaddress:-} # jail ip address +# dhcpd_hostname="" # jail hostname +# dhcpd_ipaddress="" # jail ip address safe_run () # rc command [args...] { diff --git a/net/isc-dhcp31-server/files/isc-dhcrelay.in b/net/isc-dhcp31-server/files/isc-dhcrelay.in index db10841ff32a..7e51d989c79e 100644 --- a/net/isc-dhcp31-server/files/isc-dhcrelay.in +++ b/net/isc-dhcp31-server/files/isc-dhcrelay.in @@ -12,9 +12,9 @@ # override these variables in /etc/rc.conf dhcrelay_enable=${dhcrelay_enable:-"NO"} -dhcrelay_flags=${dhcrelay_flags:-} # command option(s) -dhcrelay_servers=${dhcrelay_servers:-} # dhcrelay server(s) -dhcrelay_ifaces=${dhcrelay_ifaces:-} # ethernet interface(s) +# dhcrelay_flags="" # command option(s) +# dhcrelay_servers="" # dhcrelay server(s) +# dhcrelay_ifaces="" # ethernet interface(s) dhcrelay_precmd () { -- cgit