From 401f21aecee61e416fdab0b681936124c89c9689 Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Thu, 4 Apr 2013 15:03:12 +0000 Subject: [PATCH] Remove periodic script for ataraid(4) and add instead script for graid(8). --- etc/defaults/periodic.conf | 6 ++--- etc/periodic/daily/401.status-graid | 34 ++++++++++++++++++++++++++ etc/periodic/daily/405.status-ata-raid | 33 ------------------------- etc/periodic/daily/Makefile | 2 +- 4 files changed, 38 insertions(+), 37 deletions(-) create mode 100755 etc/periodic/daily/401.status-graid delete mode 100755 etc/periodic/daily/405.status-ata-raid diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf index 00ce1577d3fb..e630e1d0f25a 100644 --- a/etc/defaults/periodic.conf +++ b/etc/defaults/periodic.conf @@ -95,13 +95,13 @@ daily_news_expire_enable="YES" # Run news.expire daily_status_disks_enable="YES" # Check disk status daily_status_disks_df_flags="-l -h" # df(1) flags for check +# 401.status-graid +daily_status_graid_enable="NO" # Check graid(8) + # 404.status-zfs daily_status_zfs_enable="NO" # Check ZFS daily_status_zfs_zpool_list_enable="YES" # List ZFS pools -# 405.status-ata_raid -daily_status_ata_raid_enable="NO" # Check ATA raid status - # 406.status-gmirror daily_status_gmirror_enable="NO" # Check gmirror(8) diff --git a/etc/periodic/daily/401.status-graid b/etc/periodic/daily/401.status-graid new file mode 100755 index 000000000000..a28fc5bbe569 --- /dev/null +++ b/etc/periodic/daily/401.status-graid @@ -0,0 +1,34 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# If there is a global system configuration file, suck it in. +# +if [ -r /etc/defaults/periodic.conf ] +then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +case "$daily_status_graid_enable" in + [Yy][Ee][Ss]) + echo + echo 'Checking status of graid(8) devices:' + + if graid status; then + components="$(graid status -s | fgrep -v OPTIMAL)" + if [ "${components}" ]; then + rc=3 + else + rc=0 + fi + else + rc=2 + fi + ;; + + *) rc=0;; +esac + +exit $rc diff --git a/etc/periodic/daily/405.status-ata-raid b/etc/periodic/daily/405.status-ata-raid deleted file mode 100755 index f2178390e76c..000000000000 --- a/etc/periodic/daily/405.status-ata-raid +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# If there is a global system configuration file, suck it in. -# -if [ -r /etc/defaults/periodic.conf ] -then - . /etc/defaults/periodic.conf - source_periodic_confs -fi - -case "$daily_status_ata_raid_enable" in - [Yy][Ee][Ss]) - echo - echo 'Checking status of ATA raid partitions:' - - rc=0 - for raid in `find /dev/ -name 'ar[0-9]*' -type c | egrep '[0-9]$' \ - | egrep -v 's[0-9]' | cut -d / -f 3` - do - status=`/sbin/atacontrol status $raid` - echo $status - raid_rc=`echo $status | grep -v READY | wc -l` - [ $rc -eq 0 ] && [ $raid_rc -gt 0 ] && rc=3 - done - ;; - - *) rc=0;; -esac - -exit $rc diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile index 9c7f4d726394..b377be9c2207 100644 --- a/etc/periodic/daily/Makefile +++ b/etc/periodic/daily/Makefile @@ -8,7 +8,7 @@ FILES= 100.clean-disks \ 200.backup-passwd \ 330.news \ 400.status-disks \ - 405.status-ata-raid \ + 401.status-graid \ 406.status-gmirror \ 407.status-graid3 \ 408.status-gstripe \