diff options
Diffstat (limited to 'etc/periodic')
| -rw-r--r-- | etc/periodic/Makefile | 1 | ||||
| -rwxr-xr-x | etc/periodic/daily/400.status-disks | 7 | ||||
| -rwxr-xr-x | etc/periodic/daily/430.status-uptime (renamed from etc/periodic/daily/430.status-rwho) | 2 | ||||
| -rwxr-xr-x | etc/periodic/daily/800.scrub-zfs | 4 | ||||
| -rw-r--r-- | etc/periodic/daily/Makefile | 4 | ||||
| -rwxr-xr-x | etc/periodic/security/520.pfdenied | 2 |
6 files changed, 15 insertions, 5 deletions
diff --git a/etc/periodic/Makefile b/etc/periodic/Makefile index 8fb56dff051a..a2d99020fd10 100644 --- a/etc/periodic/Makefile +++ b/etc/periodic/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ SUBDIR= daily security weekly monthly +SUBDIR_PARALLEL= .include <bsd.subdir.mk> diff --git a/etc/periodic/daily/400.status-disks b/etc/periodic/daily/400.status-disks index dd828aaaf39a..bab281097dbd 100755 --- a/etc/periodic/daily/400.status-disks +++ b/etc/periodic/daily/400.status-disks @@ -16,7 +16,12 @@ case "$daily_status_disks_enable" in echo "" echo "Disk status:" - df $daily_status_disks_df_flags && rc=1 || rc=3 + if [ -n "${daily_status_disks_ignore}" ] ; then + ignore="egrep -v ${daily_status_disks_ignore}" + else + ignore="cat" + fi + (df $daily_status_disks_df_flags | ${ignore}) && rc=1 || rc=3 # display which filesystems need backing up if [ -s /etc/dumpdates ]; then diff --git a/etc/periodic/daily/430.status-rwho b/etc/periodic/daily/430.status-uptime index 44761368c933..0c8c591a5973 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/800.scrub-zfs b/etc/periodic/daily/800.scrub-zfs index ee0e52a8fd60..359be13b227a 100755 --- a/etc/periodic/daily/800.scrub-zfs +++ b/etc/periodic/daily/800.scrub-zfs @@ -43,6 +43,10 @@ case "$daily_scrub_zfs_enable" in rc=3 echo "Skipping faulted pool: ${pool}" continue ;; + *UNAVAIL*) + rc=4 + echo "Skipping unavailable pool: ${pool}" + continue ;; esac # determine how many days shall be between scrubs diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile index 15b6ae8a80e6..939dd150e4a9 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/etc/periodic/security/520.pfdenied b/etc/periodic/security/520.pfdenied index 7a32bf2a193b..3fea360f4582 100755 --- a/etc/periodic/security/520.pfdenied +++ b/etc/periodic/security/520.pfdenied @@ -44,7 +44,7 @@ rc=0 if check_yesno_period security_status_pfdenied_enable then TMP=`mktemp -t security` - if pfctl -sr -v 2>/dev/null | nawk '{if (/^block/) {buf=$0; getline; gsub(" +"," ",$0); print buf$0;} }' > ${TMP}; then + if pfctl -sr -v 2>/dev/null | nawk '{if (/^block/) {buf=$0; getline; gsub(" +"," ",$0); if ($5 > 0) print buf$0;} }' > ${TMP}; then check_diff new_only pf ${TMP} "${host} pf denied packets:" fi rc=$? |