[src/netbsd-1-5]: src/etc/rc.d Update from trunk:

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a4afbc4f8959
branches:  netbsd-1-5
changeset: 488921:a4afbc4f8959
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Aug 06 21:39:04 2000 +0000

description:
Update from trunk:
Startup script glue for the Heimdal KDC.

diffstat:

 etc/rc.d/Makefile |   4 ++--
 etc/rc.d/SERVERS  |   4 ++--
 etc/rc.d/kdc      |  17 +++++++++++++++++
 etc/rc.d/kerberos |  27 ---------------------------
 4 files changed, 21 insertions(+), 31 deletions(-)

diffs (82 lines):

diff -r f039da790303 -r a4afbc4f8959 etc/rc.d/Makefile
--- a/etc/rc.d/Makefile Sun Aug 06 21:18:32 2000 +0000
+++ b/etc/rc.d/Makefile Sun Aug 06 21:39:04 2000 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2000/06/13 16:29:54 itojun Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2000/08/06 21:39:04 thorpej Exp $
 
 FILES= DAEMON LOGIN SERVERS accounting amd apmd bootparams bootconf.sh ccd \
        cleartmp cron dhclient dhcpd dhcrelay dmesg fsck.sh gated inetd \
-       ipfilter ipmon ipnat ipsec kerberos ldconfig lkm1 lkm2 lkm3 local \
+       ipfilter ipmon ipnat ipsec kdc ldconfig lkm1 lkm2 lkm3 local \
        lpd mopd \
        motd mountall mountcritlocal mountcritremote mountd mrouted named \
        network nfsd nfslocking ntpd ntpdate rpcbind postfix ppp pwcheck quota \
diff -r f039da790303 -r a4afbc4f8959 etc/rc.d/SERVERS
--- a/etc/rc.d/SERVERS  Sun Aug 06 21:18:32 2000 +0000
+++ b/etc/rc.d/SERVERS  Sun Aug 06 21:39:04 2000 +0000
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $NetBSD: SERVERS,v 1.1 2000/03/13 04:03:54 lukem Exp $
+# $NetBSD: SERVERS,v 1.1.4.1 2000/08/06 21:39:04 thorpej Exp $
 #
 
 # PROVIDE: SERVERS
-# REQUIRE: ipmon savecore syslogd
+# REQUIRE: ipmon savecore syslogd kdc
 
 #      This is a dummy dependancy, for early-start servers relying on
 #      some basic configuration.
diff -r f039da790303 -r a4afbc4f8959 etc/rc.d/kdc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/rc.d/kdc      Sun Aug 06 21:39:04 2000 +0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# $NetBSD: kdc,v 1.1.2.2 2000/08/06 21:39:04 thorpej Exp $
+#
+
+# PROVIDE: kdc
+# REQUIRE: mountcritremote
+
+. /etc/rc.subr
+
+name="kdc"
+command="/usr/sbin/${name}"
+pidfile="/var/run/${name}.pid"
+required_files="/etc/krb5.conf"
+
+load_rc_config $name
+run_rc_command "$1"
diff -r f039da790303 -r a4afbc4f8959 etc/rc.d/kerberos
--- a/etc/rc.d/kerberos Sun Aug 06 21:18:32 2000 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: kerberos,v 1.4 2000/05/13 08:45:07 lukem Exp $
-#
-
-# PROVIDE: kerberos
-# REQUIRE: DAEMON LOGIN
-
-. /etc/rc.subr
-
-arg=$1
-
-name="kerberos"
-command="/usr/sbin/${name}"
-command_args=">> /var/log/${name}.log &"
-
-load_rc_config $name
-run_rc_command "$arg"
-
-
-name="kadmind"
-rcvar="kerberos"
-command="/usr/sbin/${name}"
-command_args="-n >> /var/log/${name}.log &"
-
-# Note: config is shared with kerberos
-run_rc_command "$arg"