aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonny Aasen <ronny@aasen.cx>2010-11-03 10:50:49 +0000
committerRonny Aasen <ronny@aasen.cx>2010-11-03 10:50:49 +0000
commit252576f00027aa8c4a7aa0b553c3fdf4d03e91a1 (patch)
tree4e8190a0f5be73acf98d03694f508d24be001d3e
parentefdaacae4035df6c9d1b5cb344e93768503d5ee3 (diff)
downloadsitesummary-252576f00027aa8c4a7aa0b553c3fdf4d03e91a1.tar.gz
sitesummary-252576f00027aa8c4a7aa0b553c3fdf4d03e91a1.tar.bz2
sitesummary-252576f00027aa8c4a7aa0b553c3fdf4d03e91a1.tar.xz
* fix lsscsi error on machines without /sys mounted.
copied method from holgers lspci fix
-rw-r--r--collect.d/system2
-rw-r--r--debian/changelog9
2 files changed, 10 insertions, 1 deletions
diff --git a/collect.d/system b/collect.d/system
index 1d8d97d..0401203 100644
--- a/collect.d/system
+++ b/collect.d/system
@@ -22,7 +22,7 @@ if type lsusb >/dev/null 2>&1; then
lsusb > lsusb
fi
-if type lsscsi >/dev/null 2>&1; then
+if [ -d /proc/bus/scsi ] && type lsscsi >/dev/null 2>&1; then
lsscsi > lsscsi
fi
diff --git a/debian/changelog b/debian/changelog
index b7b2f84..54462d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sitesummary (0.0.67̃~svn70806) UNRELEASED; urgency=low
+
+ [ Ronny Aasen ]
+ * only run lsscsi from collect.d/system, if /proc/bus/scsi exsists
+ to avoid errors on machines without /sys mouted, like chroots
+ and vservers.
+
+ -- Ronny Aasen <ronny@skolelinux.no> Wed, 03 Nov 2010 11:06:12 +0200
+
sitesummary (0.0.66) unstable; urgency=low
[ Holger Levsen ]