[SCM] debian-live branch, master, updated. 1.136.3-1-41-g57c11f5

[Chris Lamb]

The following commit has been merged in the master branch:
commit 3abe7d31ea844e9c81ebdc9bfafd0f2f3948b45d
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Aug 14 01:19:28 2008 +0100

    Hide error from attempting to "mount --move"
    
    (We get a sensible error message if it fails anyway)
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/scripts/live b/scripts/live
index 7bd673b..caaf45b 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1210,7 +1210,7 @@ setup_unionfs ()
 
 	# shows cow fs on /cow for use by live-snapshot
 	mkdir -p "${rootmnt}/live/cow"
-	mount -o move /cow "${rootmnt}/live/cow" || mount -o bind /cow "${rootmnt}/live/cow" || log_warning_msg "Unable to move or bind /cow to ${rootmnt}/live/cow"
+	mount -o move /cow "${rootmnt}/live/cow" >/dev/null 2>&1 || mount -o bind /cow "${rootmnt}/live/cow" || log_warning_msg "Unable to move or bind /cow to ${rootmnt}/live/cow"
 }
 
 check_dev ()

-- 
debian-live