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
This commit is contained in:
John Baldwin 2017-08-15 22:16:15 +00:00
parent 24328efbb4
commit 0bfcfa8634
2 changed files with 2 additions and 14 deletions

View File

@ -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 \
@ -46,14 +47,6 @@ 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 \
440.status-mailq \

View File

@ -100,6 +100,7 @@ FILES= DAEMON \
rpcbind \
rtadvd \
rtsold \
rwho \
savecore \
securelevel \
serial \
@ -271,12 +272,6 @@ SSHPACKAGE= ssh
FILES+= ftp-proxy
.endif
.if ${MK_RCMDS} != "no"
FILESGROUPS+= RCMDS
RCMDS+= rwho
RCMDSPACKAGE= rcmds
.endif
.if ${MK_ROUTED} != "no"
FILES+= routed
.endif