svn commit: r273285 - in head: . etc/rc.d

[Hiroki Sato]

Author: hrs
Date: Sun Oct 19 20:46:59 2014
New Revision: 273285
URL: https://svnweb.freebsd.org/changeset/base/273285

Log:
  - Honer MK_KERBEROS for Heimdal rc.d scripts.
  - Add rc.c/kerberos to OLD_FILES.

Modified:
  head/ObsoleteFiles.inc
  head/etc/rc.d/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Sun Oct 19 20:23:31 2014	(r273284)
+++ head/ObsoleteFiles.inc	Sun Oct 19 20:46:59 2014	(r273285)
@@ -48,6 +48,8 @@ OLD_FILES+=etc/rc.d/hv_kvpd
 # 20140917: libnv was accidentally being installed to /usr/lib instead of /lib
 OLD_LIBS+=usr/lib/libnv.a
 OLD_LIBS+=usr/lib/libnv.so.0
+# 20140829: rc.d/kerberos removed
+OLD_FILES+=etc/rc.d/kerberos
 # 20140814: libopie version bump
 OLD_LIBS+=usr/lib/libopie.so.7
 OLD_LIBS+=usr/lib32/libopie.so.7

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Sun Oct 19 20:23:31 2014	(r273284)
+++ head/etc/rc.d/Makefile	Sun Oct 19 20:46:59 2014	(r273285)
@@ -70,12 +70,12 @@ FILES=	DAEMON \
 	iscsictl \
 	iscsid \
 	jail \
-	kadmind \
-	kdc \
-	kfd \
+	${_kadmind} \
+	${_kdc} \
+	${_kfd} \
 	kld \
 	kldxref \
-	kpasswdd \
+	${_kpasswdd} \
 	ldconfig \
 	local \
 	localpkg \
@@ -181,6 +181,13 @@ _casperd=	casperd
 _nscd=		nscd
 .endif
 
+.if ${MK_KERBEROS} != "no"
+_kadmind=	kadmind
+_kdc=		kdc
+_kfd=		kfd
+_kpasswdd=	kpasswdd
+.endif
+
 .if ${MK_OFED} != "no"
 _opensm=	opensm
 .endif