Author: ngie
Date: Mon Nov 2 01:05:34 2015
New Revision: 290252
URL: https://svnweb.freebsd.org/changeset/base/290252
Log:
Rename etc/periodic/daily/430.status-rwho to periodic/daily/430.status-uptime
The command was checking local/remote system uptime, so rename the script to
match its function and to avoid confusion
The controlling variable in /etc/periodic.conf has been renamed from
daily_status_rwho_enable to daily_status_uptime_enable.
MFC after: 3 days
Reported by: Peter Jeremy <pe...@rulingia.com>
Relnotes: yes
Sponsored by: EMC / Isilon Storage Division
Added:
head/etc/periodic/daily/430.status-uptime
- copied, changed from r290251, head/etc/periodic/daily/430.status-rwho
Deleted:
head/etc/periodic/daily/430.status-rwho
Modified:
head/ObsoleteFiles.inc
head/etc/defaults/periodic.conf
head/etc/periodic/daily/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Mon Nov 2 00:42:31 2015 (r290251)
+++ head/ObsoleteFiles.inc Mon Nov 2 01:05:34 2015 (r290252)
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20151101: 430.status-rwho was renamed to 430.status-uptime
+OLD_FILES+=etc/periodic/daily/430.status-rwho
# 20151030: OpenSSL 1.0.2d import
OLD_FILES+=usr/share/openssl/man/man3/CMS_set1_signer_certs.3.gz
OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_ctrl.3.gz
Modified: head/etc/defaults/periodic.conf
==============================================================================
--- head/etc/defaults/periodic.conf Mon Nov 2 00:42:31 2015
(r290251)
+++ head/etc/defaults/periodic.conf Mon Nov 2 01:05:34 2015
(r290252)
@@ -115,8 +115,8 @@ daily_status_network_enable="YES" # Ch
daily_status_network_usedns="YES" # DNS lookups are ok
daily_status_network_netstat_flags="-d" # netstat(1)
flags
-# 430.status-rwho
-daily_status_rwho_enable="YES" # Check system status
+# 430.status-uptime
+daily_status_uptime_enable="YES" # Check system uptime
# 440.status-mailq
daily_status_mailq_enable="YES" # Check mail
status
Copied and modified: head/etc/periodic/daily/430.status-uptime (from r290251,
head/etc/periodic/daily/430.status-rwho)
==============================================================================
--- head/etc/periodic/daily/430.status-rwho Mon Nov 2 00:42:31 2015
(r290251, copy source)
+++ head/etc/periodic/daily/430.status-uptime Mon Nov 2 01:05:34 2015
(r290252)
@@ -11,7 +11,7 @@ then
source_periodic_confs
fi
-case "$daily_status_rwho_enable" in
+case "$daily_status_uptime_enable" in
[Yy][Ee][Ss])
rwho=$(echo /var/rwho/*)
if [ -f "${rwho%% *}" ]
Modified: head/etc/periodic/daily/Makefile
==============================================================================
--- head/etc/periodic/daily/Makefile Mon Nov 2 00:42:31 2015
(r290251)
+++ head/etc/periodic/daily/Makefile Mon Nov 2 01:05:34 2015
(r290252)
@@ -15,6 +15,7 @@ FILES= 100.clean-disks \
408.status-gstripe \
409.status-gconcat \
420.status-network \
+ 430.status-uptime \
450.status-security \
510.status-world-kernel \
999.local
@@ -38,8 +39,7 @@ FILES+= 480.status-ntpd
.endif
.if ${MK_RCMDS} != "no"
-FILES+= 140.clean-rwho \
- 430.status-rwho
+FILES+= 140.clean-rwho
.endif
.if ${MK_SENDMAIL} != "no"
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Nov 2 00:42:31
2015 (r290251)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Nov 2 01:05:34
2015 (r290252)
@@ -6517,8 +6517,7 @@ OLD_FILES+=usr/share/man/man8/repquota.8
.if ${MK_RCMDS} == no
OLD_FILES+=bin/rcp
OLD_FILES+=etc/rc.d/rwho
-OLD_FILES+=etc/periodic/daily/140.clean-rwho
-OLD_FILES+=etc/periodic/daily/430.status-rwho
+OLD_FILES+=etc/periodic/daily/140.clean-rwho
OLD_FILES+=rescue/rcp
OLD_FILES+=usr/bin/rlogin
OLD_FILES+=usr/bin/rsh
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
