On Sat, 3 Oct 2020 08:00:44 +0200, Ingo Schwarze <schwa...@usta.de> wrote:
> But this needs to remain: > > > -Reports on which file systems need to be dumped via > > -.Xr dump 8 . > > -.It Indeed, I wrongly assumed that the other dump call was silent. Here's the updated diff: Index: share/man/man8/daily.8 =================================================================== RCS file: /cvs/src/share/man/man8/daily.8,v retrieving revision 1.28 diff -u -p -r1.28 daily.8 --- share/man/man8/daily.8 26 Jul 2020 13:27:24 -0000 1.28 +++ share/man/man8/daily.8 3 Oct 2020 12:40:12 -0000 @@ -114,15 +114,9 @@ Lists any daemons which are enabled in .Xr rc.conf.local 8 but which are not actually running. .It -Checks disk status. -Reports on the amount of disk used/available via -.Xr df 1 . Reports on which file systems need to be dumped via .Xr dump 8 . .It -Reports networking statistics via -.Xr netstat 1 . -.It Runs the .Xr calendar 1 utility unless the environment variable @@ -205,15 +199,6 @@ If set to 1, run with the no-write flag. .It Ev ROOTBACKUP If set to 1, make a backup of the root file system. -.It Ev VERBOSESTATUS -If set to 0, -.Xr df 1 , -.Xr dump 8 , -and -.Xr netstat 1 -are skipped. -Consequently, if none of the other commands produce any output, -no mail will be sent to root. .El .Pp The following variables can be set in @@ -250,9 +235,7 @@ Root .Sh SEE ALSO .Xr calendar 1 , .Xr crontab 1 , -.Xr df 1 , .Xr locate 1 , -.Xr netstat 1 , .Xr rdist 1 , .Xr whatis 1 , .Xr crontab 5 , Index: share/man/man8/afterboot.8 =================================================================== RCS file: /cvs/src/share/man/man8/afterboot.8,v retrieving revision 1.165 diff -u -p -r1.165 afterboot.8 --- share/man/man8/afterboot.8 9 Feb 2020 16:36:02 -0000 1.165 +++ share/man/man8/afterboot.8 3 Oct 2020 12:40:12 -0000 @@ -458,8 +458,6 @@ to understand what the periodic system m how to customize them: For example, to enable .Ev ROOTBACKUP -or to disable -.Ev VERBOSESTATUS , or to add local maintenance code to .Pa /etc/daily.local , /etc/weekly.local , or Index: etc/daily =================================================================== RCS file: /cvs/src/etc/daily,v retrieving revision 1.93 diff -u -p -r1.93 daily --- etc/daily 9 Sep 2019 20:02:26 -0000 1.93 +++ etc/daily 3 Oct 2020 12:40:12 -0000 @@ -136,21 +136,8 @@ done next_part "Services that should be running but aren't:" rcctl ls failed -next_part "Checking subsystem status:" -if [ "X$VERBOSESTATUS" != X0 ]; then - echo "" - echo "disks:" - df -ikl - echo "" - dump W -else - dump w | grep -vB1 ^Dump -fi - -next_part "network:" -if [ "X$VERBOSESTATUS" != X0 ]; then - netstat -ivn -fi +next_part "Backing up filesystems with dump:" +dump w | grep -vB1 ^Dump next_part "Running calendar in the background:" if [ "X$CALENDAR" != X0 -a \
