Author: emaste
Date: Sun Mar 11 17:43:04 2018
New Revision: 330770
URL: https://svnweb.freebsd.org/changeset/base/330770
Log:
MFC r322552 by jhb: 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
Modified:
stable/11/etc/periodic/daily/Makefile
stable/11/etc/rc.d/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/etc/periodic/daily/Makefile
==============================================================================
--- stable/11/etc/periodic/daily/Makefile Sun Mar 11 17:40:02 2018
(r330769)
+++ stable/11/etc/periodic/daily/Makefile Sun Mar 11 17:43:04 2018
(r330770)
@@ -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: stable/11/etc/rc.d/Makefile
==============================================================================
--- stable/11/etc/rc.d/Makefile Sun Mar 11 17:40:02 2018 (r330769)
+++ stable/11/etc/rc.d/Makefile Sun Mar 11 17:43:04 2018 (r330770)
@@ -100,6 +100,7 @@ FILES= DAEMON \
rpcbind \
rtadvd \
rtsold \
+ rwho \
savecore \
securelevel \
serial \
@@ -277,12 +278,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"
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
