[SCM] Debian Live initramfs hook branch, master, updated. 1.154.3-1-1-g0762fb9
Daniel Baumann
daniel at debian.org
Mon Dec 22 14:38:18 UTC 2008
The following commit has been merged in the master branch:
commit 0762fb97a408b1131c2a5578cc6f63f9b72cf438
Author: Rene Mayrhofer <rene at mayrhofer.eu.org>
Date: Mon Dec 22 15:32:48 2008 +0100
Support further checks on loopback image and support skipping union mounts (Closes: #509446).
diff --git a/scripts/live b/scripts/live
index 2b8ff01..d06dd20 100755
--- a/scripts/live
+++ b/scripts/live
@@ -427,6 +427,11 @@ Arguments ()
export PLAIN_ROOT
;;
+ skipunion)
+ SKIP_UNION_MOUNTS="Yes"
+ export SKIP_UNION_MOUNTS
+ ;;
+
root=*)
ROOT="${ARGUMENT#root=}"
export ROOT
@@ -1085,6 +1090,12 @@ setup_unionfs ()
do
imagename=$(basename "${image}")
+ export image devname
+ maybe_break live-realpremount
+ log_begin_msg "Running /scripts/live-realpremount"
+ run_scripts /scripts/live-realpremount
+ log_end_msg
+
if [ -d "${image}" ]
then
# it is a plain directory: do nothing
@@ -1242,8 +1253,12 @@ setup_unionfs ()
mount --bind ${exposedrootfs} ${rootmnt} || \
panic "bind mount of ${exposedrootfs} failed"
- cow_dirs='/var/tmp /var/lock /var/run /var/log /var/spool
- /home /var/lib/live'
+ if [ -z "${SKIP_UNION_MOUNTS}" ]
+ then
+ cow_dirs='/var/tmp /var/lock /var/run /var/log /var/spool /home /var/lib/live'
+ else
+ cow_dirs=''
+ fi
for dir in ${cow_dirs}; do
mkdir -p /cow${dir}
--
Debian Live initramfs hook
More information about the debian-live-changes
mailing list