Only test for I/O errors since last system boot

diff --git a/client/lib/tests/Disks.tst b/client/lib/tests/Disks.tst
index 297aae2765cf06fe7a81d2c467ddc8d4766002c8..d0816084fdf5ef7bfd0006d200e7c9da39d5a9fc 100644 (file)
--- a/client/lib/tests/Disks.tst
+++ b/client/lib/tests/Disks.tst
@@ -3,7 +3,17 @@
 
 if [ `uname` = "Darwin" ]; then
        SERVICE="Disks_p"
 
 if [ `uname` = "Darwin" ]; then
        SERVICE="Disks_p"

-       error=`LC_ALL=C grep "I/O" /var/log/system.log | grep -v nagcollect | tail -n 1`
+       offset=`LC_ALL=C grep -b "BOOT_TIME:" /var/log/system.log \
+        | tail -n 1 | cut -d':' -f1`
+       if [ -n "$offset" ]; then
+               # reboot detected in system.log
+               error=`LC_ALL=C tail -c "+$offset" /var/log/system.log \
+                | grep "I/O" | grep -v nagcollect | tail -n 1`
+       else
+               # no reboot detected in system.log
+               error=`LC_ALL=C grep "I/O" /var/log/system.log \
+                | grep -v nagcollect | tail -n 1`
+       fi

        if [ -n "$error" ]; then
                msg=`echo $error | cut -d' ' -f6-`
                STATUS=2
        if [ -n "$error" ]; then
                msg=`echo $error | cut -d' ' -f6-`
                STATUS=2