[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, squeeze, updated. 0.6-24-g390a900

[Andreas B. Mundt]

The following commit has been merged in the squeeze branch:
commit 5ef8c38eb3ec29ba279fe842d9c7c36a9c49dd79
Author: Andreas B. Mundt <andi at debian.org>
Date:   Thu Sep 20 10:48:07 2012 +0200

    Fix backup:  Do not fail when backup directory is already mounted.

diff --git a/fai/config/files/etc/cron.daily/backup/SERVER_A b/fai/config/files/etc/cron.daily/backup/SERVER_A
index 46e369f..71980ea 100755
--- a/fai/config/files/etc/cron.daily/backup/SERVER_A
+++ b/fai/config/files/etc/cron.daily/backup/SERVER_A
@@ -12,7 +12,7 @@ MISC_DIR="${DIR}/tmp/misc/"
 # from dirvish:
 mount_check() {
     mntout=`tempfile -p mount`
-    mount $1 >$mntout 2>&1
+    mount $1 >$mntout 2>&1 || true
     if [ ! -d $1/lost+found ]; then # only works for "real" filesystems :-)
                                         # (Yes, I know about reiserfs.)
         echo "'mount $1' failed?! Stopping."

-- 
Debian-LAN development and packaging