Author: jhb Date: Fri Mar 27 00:37:41 2015 New Revision: 280721 URL: https://svnweb.freebsd.org/changeset/base/280721
Log: Allow additional flags to be passed to netstat -i in the daily status check. In particular, this allows an administrator to specify "-h" for human readable output if that is preferred. The default setting passes "-d", so that can be excluded by using a custom setting. Differential Revision: https://reviews.freebsd.org/D2034 Submitted by: Lystopad Aleksandr <l...@laa.zp.ua> (patch to add option for -h) Reviewed by: bz MFC after: 1 week Modified: head/etc/defaults/periodic.conf head/etc/periodic/daily/420.status-network head/share/man/man5/periodic.conf.5 Modified: head/etc/defaults/periodic.conf ============================================================================== --- head/etc/defaults/periodic.conf Thu Mar 26 23:40:22 2015 (r280720) +++ head/etc/defaults/periodic.conf Fri Mar 27 00:37:41 2015 (r280721) @@ -113,6 +113,7 @@ daily_status_gconcat_enable="NO" # Che # 420.status-network 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 Modified: head/etc/periodic/daily/420.status-network ============================================================================== --- head/etc/periodic/daily/420.status-network Thu Mar 26 23:40:22 2015 (r280720) +++ head/etc/periodic/daily/420.status-network Fri Mar 27 00:37:41 2015 (r280721) @@ -16,12 +16,14 @@ case "$daily_status_network_enable" in echo "" echo "Network interface status:" + flags="${daily_status_network_netstat_flags}" case "$daily_status_network_usedns" in [Yy][Ee][Ss]) - netstat -id && rc=0 || rc=3;; + ;; *) - netstat -idn && rc=0 || rc=3;; - esac;; + flags="${flags} -n";; + esac + netstat -i ${flags} && rc=0 || rc=3;; *) rc=0;; esac Modified: head/share/man/man5/periodic.conf.5 ============================================================================== --- head/share/man/man5/periodic.conf.5 Thu Mar 26 23:40:22 2015 (r280720) +++ head/share/man/man5/periodic.conf.5 Fri Mar 27 00:37:41 2015 (r280721) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 13, 2015 +.Dd March 26, 2015 .Dt PERIODIC.CONF 5 .Os .Sh NAME @@ -401,6 +401,16 @@ Set to .Dq Li YES if you want to run .Nm netstat Fl i . +.It Va daily_status_network_netstat_flags +.Pq Vt str +Set to additional arguments for the +.Xr netstat 1 +utility when +.Va daily_status_network_enable +is set to +.Dq Li YES . +The default is +.Fl d . .It Va daily_status_network_usedns .Pq Vt bool Set to _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
