From 2a923f8f3c8f7f3ed86548e5cbb242f4c9a0b60d Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Mon, 2 Nov 2015 01:05:34 +0000
Subject: [PATCH] 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 <peter@rulingia.com>
Relnotes: yes
Sponsored by: EMC / Isilon Storage Division
---
 ObsoleteFiles.inc                                         | 2 ++
 etc/defaults/periodic.conf                                | 4 ++--
 etc/periodic/daily/{430.status-rwho => 430.status-uptime} | 2 +-
 etc/periodic/daily/Makefile                               | 4 ++--
 tools/build/mk/OptionalObsoleteFiles.inc                  | 3 +--
 5 files changed, 8 insertions(+), 7 deletions(-)
 rename etc/periodic/daily/{430.status-rwho => 430.status-uptime} (93%)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index ea7d02fdbe1..78f6aab8794 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -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
diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index fbc5d0ae1eb..855d5609cb8 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -115,8 +115,8 @@ daily_status_network_enable="YES"			# Check network status
 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
diff --git a/etc/periodic/daily/430.status-rwho b/etc/periodic/daily/430.status-uptime
similarity index 93%
rename from etc/periodic/daily/430.status-rwho
rename to etc/periodic/daily/430.status-uptime
index 44761368c93..0c8c591a597 100755
--- a/etc/periodic/daily/430.status-rwho
+++ b/etc/periodic/daily/430.status-uptime
@@ -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%% *}" ]
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index 15b6ae8a80e..939dd150e4a 100644
--- a/etc/periodic/daily/Makefile
+++ b/etc/periodic/daily/Makefile
@@ -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"
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 50fd4ed244b..60859a4c576 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -6517,8 +6517,7 @@ OLD_FILES+=usr/share/man/man8/repquota.8.gz
 .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