From fc9b42d5133cf916a091844e6434bb273801e2db Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 1 Jan 2013 13:22:47 +0100
Subject: ignore failures on df

---
 bin/g-i-installation.sh | 2 +-
 bin/housekeeping.sh     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index f1e074b1..43255ec2 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -571,7 +571,7 @@ save_logs() {
 	#
 	# copy logs (and continue if some logs cannot be copied)
 	#
-	set -e
+	set +e
 	mkdir -p $RESULTS/log
 	sudo cp -r $SYSTEM_MNT/var/log/installer $RESULTS/log/
 	sudo chown -R jenkins:jenkins $RESULTS/log/
diff --git a/bin/housekeeping.sh b/bin/housekeeping.sh
index cc38e49d..5bce9dfa 100755
--- a/bin/housekeeping.sh
+++ b/bin/housekeeping.sh
@@ -63,7 +63,8 @@ general_housekeeping() {
 	uptime
 
 	echo
-	df -h
+	# ignore unreadable /media fuse mountpoints from guestmount
+	df -h 2>/dev/null || true
 
 	echo
 	for DIR in /var/cache/apt/archives/ /var/spool/squid/ /var/cache/pbuilder/build/ /var/lib/jenkins/jobs/ ; do
@@ -77,7 +78,7 @@ general_housekeeping() {
 	echo
 	vnstat
 
-	df |grep tmpfs > /dev/null || ( echo ; echo "Warning: no tmpfs mounts in use. Please investigate the host system." ; exit 1 )
+	(df 2>/dev/null || true ) | grep tmpfs > /dev/null || ( echo ; echo "Warning: no tmpfs mounts in use. Please investigate the host system." ; exit 1 )
 }
 
 #
-- 
cgit v1.2.3-70-g09d2