[SCM] debian-live branch, master, updated. 1.130.1-3-32-g6aa5107

Marco Amadori amadorim at vdavda.com
Fri Jun 13 10:31:28 UTC 2008


The following commit has been merged in the master branch:
commit 6aa510709b0ccb1d870dac7529462d2e6c69d20a
Author: Marco Amadori <amadorim at vdavda.com>
Date:   Mon Jun 9 15:24:41 2008 +0200

    Try to bind /cow to /live/cow if unable to move.
    
    * This should re-enable using of live-snapshot with targets differents
      from static list cpio's.
    
    Signed-off-by: Marco Amadori <amadorim at vdavda.com>

diff --git a/scripts/live b/scripts/live
index 62b5224..3f39c97 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1173,7 +1173,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 move /cow "${rootmnt}/live/cow" || mount -o bind /cow "${rootmnt}/live/cow" || [ "${quiet}" != "y" ] && log_warning_msg "Unable to move or bind /cow to ${rootmnt}/live/cow"
 }
 
 check_dev ()

-- 
debian-live



More information about the debian-live-changes mailing list