[SCM] live-boot branch, debian-next, updated. debian/2.0_a15-1-4-g1c4dc9f

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 1c4dc9f658699ba622c33f8333c4d0d6da02c075
Author: Michal Suchanek <hramrach at centrum.cz>
Date:   Tue Jul 27 12:05:26 2010 +0200

    Fix omitpids to work with readonly images.

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 71ae122..12d0f94 100644
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -203,8 +203,8 @@ case "${1}" in
 		;;
 	start)
 		log_begin_msg "${NAME} is configuring sendsigs..."
-		if [ -f /live/image/root.pid ] ; then
-			cat /live/image/root.pid >> /var/run/sendsigs.omit
+		if [ -f /live/root.pid ] ; then
+			cat /live/root.pid >> /var/run/sendsigs.omit
 		fi
 		log_end_msg 0
 		;;
diff --git a/scripts/live b/scripts/live
index 295b75f..a17eb42 100755
--- a/scripts/live
+++ b/scripts/live
@@ -801,7 +801,7 @@ do_httpmount ()
 						fi
 						modprobe fuse
 						$FUSE_MOUNT "${url}" "${dest}"
-						FUSE_PID="$(minips h -C "$FUSE_MOUNT" | { read x y ; echo "$x" ; } )"
+						ROOT_PID="$(minips h -C "$FUSE_MOUNT" | { read x y ; echo "$x" ; } )"
 					fi
 					[ ${?} -eq 0 ] && rc=0
 					[ "${extension}" = "tgz" ] && live_dest="ram"
@@ -832,9 +832,6 @@ do_httpmount ()
 	elif [ "${webfile}"  != "FETCH" ] ; then
 		NETBOOT="${webfile}"
 		export NETBOOT
-		if [ -n "${FUSE_PID}" ] ; then
-			echo "${FUSE_PID}" > ${mountpoint}/root.pid
-		fi
 	fi
 
 	return ${rc}
@@ -1795,6 +1792,11 @@ mountroot ()
 		mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}"
 	fi
 
+
+	if [ -n "${ROOT_PID}" ] ; then
+		echo "${ROOT_PID}" > "${rootmnt}"/live/root.pid
+	fi
+
 	log_end_msg
 
 	# unionfs-fuse needs /dev to be bind-mounted for the duration of

-- 
live-boot