svn commit: r235107 - in head/etc: defaults rc.d

[Stanislav Sedov]

Author: stas
Date: Sun May  6 20:46:04 2012
New Revision: 235107
URL: http://svn.freebsd.org/changeset/base/235107

Log:
  - Change kfd rc script to be more conformant with rcNG conventions:
    o change rcname to kfd;
    o move mandatory options to command_args;
    o add missing "shutdown" keyword;
    o fix require line.  Kfd doesn't really need to be started before
      daemons.
  
  Suggested by:	dougb

Modified:
  head/etc/defaults/rc.conf
  head/etc/rc.d/kfd

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Sun May  6 20:40:18 2012	(r235106)
+++ head/etc/defaults/rc.conf	Sun May  6 20:46:04 2012	(r235107)
@@ -297,8 +297,8 @@ kadmind5_server_enable="NO"	# Run kadmin
 kadmind5_server="/usr/libexec/kadmind"	# path to kerberos 5 admin daemon
 kpasswdd_server_enable="NO"	# Run kpasswdd (or NO)
 kpasswdd_server="/usr/libexec/kpasswdd"	# path to kerberos 5 passwd daemon
-kfd_server_enable="NO"		# Run kfd (or NO)
-kfd_server="/usr/libexec/kfd"	# path to kerberos 5 kfd daemon
+kfd_enable="NO"			# Run kfd (or NO)
+kfd_program="/usr/libexec/kfd"	# path to kerberos 5 kfd daemon
 
 gssd_enable="NO"		# Run the gssd daemon (or NO).
 gssd_flags=""			# Flags for gssd.

Modified: head/etc/rc.d/kfd
==============================================================================
--- head/etc/rc.d/kfd	Sun May  6 20:40:18 2012	(r235106)
+++ head/etc/rc.d/kfd	Sun May  6 20:46:04 2012	(r235107)
@@ -4,16 +4,14 @@
 #
 
 # PROVIDE: kfd
-# BEFORE: DAEMON
+# REQUIRE: NETWORK
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
-name="kfd"
+name=kfd
+rcvar=kfd_enable
 load_rc_config $name
-rcvar="kfd_server_enable"
-unset start_cmd
-command="${kfd_server}"
-kfd_flags="-i"
-command_args="&"
+command_args="-i &"
 
 run_rc_command "$1"