aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetter Reinholdtsen <pere@hungry.com>2009-04-03 06:22:08 +0000
committerPetter Reinholdtsen <pere@hungry.com>2009-04-03 06:22:08 +0000
commit2d34021858dc7ae239bf2047cfed05e1c01b8d70 (patch)
tree513d709b5797c2d418ddba92ae770b0a14d00e61
parentfeb45872c12481f498424bb6037c6dca85a643c2 (diff)
downloadsitesummary-2d34021858dc7ae239bf2047cfed05e1c01b8d70.tar.gz
sitesummary-2d34021858dc7ae239bf2047cfed05e1c01b8d70.tar.bz2
sitesummary-2d34021858dc7ae239bf2047cfed05e1c01b8d70.tar.xz
* Get rid of error messages from laptop-detect when collecting system
information.
-rw-r--r--collect.d/system4
-rw-r--r--debian/changelog4
2 files changed, 7 insertions, 1 deletions
diff --git a/collect.d/system b/collect.d/system
index 21909c7..1ea8196 100644
--- a/collect.d/system
+++ b/collect.d/system
@@ -44,7 +44,9 @@ cat /proc/mounts > procmounts
# thin clients from diskless workstations.
runlevel > runlevel
-if [ -x /usr/sbin/laptop-detect ] && /usr/sbin/laptop-detect; then
+# Throw away error message from laptop-detect using dmidecode in Xen
+# domUs. See #438693 for more info.
+if [ -x /usr/sbin/laptop-detect ] && /usr/sbin/laptop-detect 2>/dev/null; then
touch laptop
fi
diff --git a/debian/changelog b/debian/changelog
index ca31067..29f23d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ sitesummary (0.0.48) UNRELEASED; urgency=low
[ Holger Levsen]
* Add depends for net-tools to sitesummary-client.
+ [ Petter Reinholdtsen ]
+ * Get rid of error messages from laptop-detect when collecting system
+ information.
+
-- Holger Levsen <holger@debian.org> Sat, 21 Mar 2009 13:58:43 +0100
sitesummary (0.0.47) unstable; urgency=low