[SCM] live-boot branch, debian, updated. debian/3.0_b3-1

Daniel Baumann daniel at debian.org
Wed Sep 26 12:40:58 UTC 2012


The following commit has been merged in the debian branch:
commit c0b91e4572ddbbfa5da4e61bfd99ad20bc2f3dc1
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 26 13:51:50 2012 +0200

    Updating code for exposing of overlay mounts under /live too.

diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh
index 9318f9b..d377d34 100755
--- a/scripts/boot/9990-overlay.sh
+++ b/scripts/boot/9990-overlay.sh
@@ -426,8 +426,9 @@ setup_unionfs ()
 		fi
 	done
 
-	# shows cow fs on /overlay (FIXME: do we still need/want this? probably yes)
 	mkdir -p "${rootmnt}/live/overlay"
-	mount -o move /live/overlay "${rootmnt}/live/overlay" >/dev/null 2>&1 || mount -o bind /overlay "${rootmnt}/live/overlay" || log_warning_msg "Unable to move or bind /overlay to ${rootmnt}/live/overlay"
+	mount -o move /live/overlay "${rootmnt}/live/overlay" > /dev/null 2>&1 || \
+		mount -o bind /overlay "${rootmnt}/live/overlay" || \
+		log_warning_msg "W: failed to mount /overlay to ${rootmnt}/live/overlay"
 
 }

-- 
live-boot



More information about the debian-live-changes mailing list