[SCM] debian-live/live-initramfs branch, master, updated. 1.110.1-1-10-gd09e6b6

[Daniel Baumann]

The branch, master has been updated
       via  d09e6b6f467e90193a9061820775ef49ac42c8bd (commit)
       via  df6af5f3919c069d8faa92dcf1b344d8a1407f51 (commit)
       via  341f4463c048da942a4343ecf85aa2a0099b92fe (commit)
       via  2a42e887aed345078acc51f8897b10e5c41db505 (commit)
      from  9dad92405e7bc4663458eb51162f5de9852a005e (commit)


- Shortlog ------------------------------------------------------------
d09e6b6 Preparing live-initramfs 1.110.3-1.
df6af5f Releasing live-initramfs 1.110.3-1.
341f446 Fix typo to get serial console to work
2a42e88 add support for exposedroot option for live-helper

Summary of changes:
 Makefile         |    8 ++++----
 debian/changelog |   17 ++++++++++++++++-
 scripts/live     |   42 +++++++++++++++++++++++++++++++++++++++---
 3 files changed, 59 insertions(+), 8 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit d09e6b6f467e90193a9061820775ef49ac42c8bd
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Oct 29 12:05:29 2007 +0100

    Preparing live-initramfs 1.110.3-1.

diff --git a/Makefile b/Makefile
index f7573f4..347d449 100644
--- a/Makefile
+++ b/Makefile
@@ -104,10 +104,10 @@ uninstall:
 update:
 	set -e; for FILE in docs/parameters.txt; \
 	do \
-		sed -i	-e 's/2007\\-10\\-22/2007\\-10\\-29/' \
-			-e 's/2007-10-22/2007-10-29/' \
-			-e 's/22.10.2007/29.10.2007/' \
-			-e 's/1.110.3/1.110.4/' \
+		sed -i	-e 's/2007\\-10\\-29/2007\\-11\\-05/' \
+			-e 's/2007-10-29/2007-11-05/' \
+			-e 's/29.10.2007/05.11.2007/' \
+			-e 's/1.110.4/1.110.5/' \
 		$$FILE; \
 	done
 
diff --git a/debian/changelog b/debian/changelog
index 964cd8a..5272fd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-initramfs (1.110.4-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian>  Mon, 29 Oct 2007 00:00:00 +0100
+
 live-initramfs (1.110.3-1) unstable; urgency=medium
 
   [ Daniel Baumann ]

commit df6af5f3919c069d8faa92dcf1b344d8a1407f51
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Oct 29 12:04:07 2007 +0100

    Releasing live-initramfs 1.110.3-1.

diff --git a/debian/changelog b/debian/changelog
index 76d4276..964cd8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,15 @@
-live-initramfs (1.110.3-1) UNRELEASED; urgency=medium
+live-initramfs (1.110.3-1) unstable; urgency=medium
 
+  [ Daniel Baumann ]
   * New upstream release.
+  * Preparing live-initramfs 1.110.3-1.
+  * Removing ubuntu support.
+
+  [ Alex Owen ]
+  * Fix typo to get serial console to work
+
+  [ Jesse Hathaway ]
+  * add support for exposedroot option for live-helper
 
  -- Daniel Baumann <daniel at debian>  Mon, 22 Oct 2007 00:00:00 +0200
 

commit 341f4463c048da942a4343ecf85aa2a0099b92fe
Author: Alex Owen <r.alex.owen at gmail.com>
Date:   Sun Oct 21 16:25:53 2007 +0100

    Fix typo to get serial console to work

diff --git a/scripts/live b/scripts/live
index 8f84ed2..9567301 100755
--- a/scripts/live
+++ b/scripts/live
@@ -45,7 +45,7 @@ Arguments ()
 
 			console=*)
 				DEFCONSOLE="${ARGUMENT#*=}"
-				export DEFCONFSOLE
+				export DEFCONSOLE
 				;;
 
 			debug)

commit 2a42e887aed345078acc51f8897b10e5c41db505
Author: Jesse Hathaway <jesse at mbuki-mvuki.org>
Date:   Tue Oct 23 16:57:19 2007 -0400

    add support for exposedroot option for live-helper

diff --git a/scripts/live b/scripts/live
index b4254e1..8f84ed2 100755
--- a/scripts/live
+++ b/scripts/live
@@ -371,6 +371,11 @@ Arguments ()
 				export TORAM MODULETORAM
 				;;
 
+			exposedroot)
+				EXPOSED_ROOT="Yes"
+				export EXPOSED_ROOT
+				;;
+
 			union=*)
 				UNIONTYPE="${ARGUMENT#union=}"
 				export UNIONTYPE
@@ -961,9 +966,40 @@ setup_unionfs ()
 		fi
 	fi
 
-	mount ${cowdevice} -t ${cow_fstype} -o rw,noatime /cow || panic "Can not mount ${cowdevice} on /cow"
+	rofscount=$(echo ${rofslist} |wc -w)
+
+	if [ -n "${EXPOSED_ROOT}" ]
+	then
+		if [ ${rofscount} -ne 1 ]
+		then
+			panic "only one RO file system supported with exposedroot: ${rofslist}"
+		fi
+		exposedrootfs=${rofslist%% }
+
+		mount --bind ${exposedrootfs} ${rootmnt} || \
+			panic "bind mount of ${exposedrootfs} failed"
+
+		mount ${cowdevice} -t ${cow_fstype} -o rw,noatime /cow || \
+			panic "Can not mount ${cowdevice} on /cow"
+
+		cow_dirs='/tmp /var/tmp /var/lock /var/run /var/log /var/spool
+			/home /live /var/lib/live'
 
-	mount -t ${UNIONTYPE} -o noatime,dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "${UNIONTYPE} mount failed"
+		for dir in ${cow_dirs}; do
+			mkdir -p /cow${dir}
+			mount -t ${UNIONTYPE} \
+				-o rw,noatime,dirs=/cow${dir}=rw:${exposedrootfs}${dir}=ro \
+				${UNIONTYPE} "${rootmnt}${dir}" || \
+				panic "mount ${UNIONTYPE} on ${rootmnt}${dir} failed with option \
+					rw,noatime,dirs=/cow${dir}=rw:${exposedrootfs}${dir}=ro"
+		done
+	else
+		mount ${cowdevice} -t ${cow_fstype} -o rw,noatime /cow || \
+			panic "Can not mount ${cowdevice} on /cow"
+		mount -t ${UNIONTYPE} -o noatime,dirs=/cow=rw:${rofsstring} \
+			${UNIONTYPE} "${rootmnt}" || panic "mount ${UNIONTYPE} on \
+			${rootmnt} failed with option noatime,dirs=/cow=rw:${rofsstring}"
+	fi
 
 	# Adding other custom mounts
 	if [ -n "${PERSISTENT}" ]

-- 
debian-live/live-initramfs