From b1ddc9656e20c3a952b62597f40a097a134b47a3 Mon Sep 17 00:00:00 2001 From: micah Date: Tue, 24 Jun 2008 19:57:31 +0000 Subject: [PATCH] added more robust mdadm raid device capture, by actually scanning active arrays via mdadm, rather than just catting the mdadm.conf file, which may be empty git-svn-id: http://code.autistici.org/svn/backupninja/trunk@580 758a04ac-41e6-0310-8a23-8373a73cc35d --- ChangeLog | 3 +++ handlers/sys.in | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index df24adc..3461200 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,9 @@ version 0.9.6 -- unreleased debconf-get-selections . fixed catifexec function to actually work, also now passes the arguments given to catifexec() to the called command (Thanks John Hallam!) + . Added more robust software RAID information capture by running mdadm + -Q --detail /dev/md?* because some people may have empty mdadm.conf files + (Thanks to John Hallam). version 0.9.5 -- December 2, 2007 backupninja changes diff --git a/handlers/sys.in b/handlers/sys.in index 9e6343f..cf4d77e 100755 --- a/handlers/sys.in +++ b/handlers/sys.in @@ -382,7 +382,7 @@ STATUS="Gathering information about your ide drivers:" catiffile "/proc/ide" STATUS="Gathering information about your bus:" -catifexec lspci +catifexec "/usr/bin/lspci" catiffile "/proc/bus" echo @@ -393,7 +393,7 @@ STATUS="Collecting information from /etc/fstab:" catiffile "/etc/fstab" STATUS="Collecting disk partition information:" -catifexec "fdisk -l" +catifexec "/sbin/fdisk -l" STATUS="Checking mounted file systems (mount) " catifexec "/bin/mount" @@ -410,6 +410,9 @@ catiffile "/etc/raidtab" STATUS="Collecting Software RAID information (/etc/mdadm.conf)" catiffile "/etc/mdadm.conf" +STATUS="Collecting Software RAID information (/sbin/mdadm -Q)" +catifexec "/sbin/mdadm" "-Q" "--detail" '/dev/md?*' + STATUS="Collecting Automount information (auto.master)" catiffile "/etc/auto.master" -- 2.30.2