From: Marco Amadori <amadorim@vdavda.com>
Date: Mon, 9 Jun 2008 13:24:41 +0000 (+0200)
Subject: Try to bind /cow to /live/cow if unable to move.
X-Git-Tag: debian/1.136.1-1~16
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=e3a6c79ff8476f797274332ad0cfe9c87539f17f;p=live-boot-grml.git

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@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 ()