svn commit: r322552 - in head/etc: periodic/daily rc.d

[John Baldwin]

Author: jhb
Date: Tue Aug 15 22:16:15 2017
New Revision: 322552
URL: https://svnweb.freebsd.org/changeset/base/322552

Log:
  Unconditionally install rwhod support scripts.
  
  r322277 moved rwho* and ruptime out of the MK_RCMDS conditional including
  updating the obsolete files entries to not remove these scripts due to
  WITHOUT_RCMDS=yes.  However, the initial installation was still conditional
  on MK_RCMDS, so new installs did not include these scripts and upgrades via
  mergemaster or etcupdate removed them.
  
  PR:		220953
  MFC after:	1 month

Modified:
  head/etc/periodic/daily/Makefile
  head/etc/rc.d/Makefile

Modified: head/etc/periodic/daily/Makefile
==============================================================================
--- head/etc/periodic/daily/Makefile	Tue Aug 15 20:27:07 2017	(r322551)
+++ head/etc/periodic/daily/Makefile	Tue Aug 15 22:16:15 2017	(r322552)
@@ -7,6 +7,7 @@ FILESGROUPS=FILES
 FILES=	100.clean-disks \
 	110.clean-tmps \
 	120.clean-preserve \
+	140.clean-rwho \
 	200.backup-passwd \
 	210.backup-aliases \
 	330.news \
@@ -45,14 +46,6 @@ FILES+=	130.clean-msgs
 FILES+=	480.status-ntpd \
 	480.leapfile-ntpd
 .endif
-
-.if ${MK_RCMDS} != "no"
-FILESGROUPS+=	RCMDS
-RCMDS+=	140.clean-rwho
-.endif
-RCMDSDIR=	/etc/periodic/daily
-RCMDSMODE=	${BINMODE}
-RCMDSPACKAGE=	rcmds
 
 .if ${MK_SENDMAIL} != "no"
 FILES+=	150.clean-hoststat \

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Tue Aug 15 20:27:07 2017	(r322551)
+++ head/etc/rc.d/Makefile	Tue Aug 15 22:16:15 2017	(r322552)
@@ -100,6 +100,7 @@ FILES=	DAEMON \
 	rpcbind \
 	rtadvd \
 	rtsold \
+	rwho \
 	savecore \
 	securelevel \
 	serial \
@@ -269,12 +270,6 @@ SSHPACKAGE=	ssh
 
 .if ${MK_PF} != "no"
 FILES+=		ftp-proxy
-.endif
-
-.if ${MK_RCMDS} != "no"
-FILESGROUPS+=	RCMDS
-RCMDS+=		rwho
-RCMDSPACKAGE=	rcmds
 .endif
 
 .if ${MK_ROUTED} != "no"