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

Daniel Baumann daniel at debian.org
Sat Jun 11 09:24:10 UTC 2011


The following commit has been merged in the debian branch:
commit 46d2cb15374b01373fdb85fb36ca28c21b4ca43a
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat May 28 08:29:47 2011 +0200

    Updating and correcting sendsigs.omit support for /run (Closes: #628188).

diff --git a/debian/live-boot.init b/debian/live-boot.init
index f0982a8..cd2e4cd 100644
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -211,16 +211,9 @@ do_stop ()
 }
 
 case "${1}" in
-	restart|reload|force-reload|status)
+	start|restart|reload|force-reload|status)
 		[ "${VERBOSE}" != no ] && log_end_msg 0
 		;;
-	start)
-		log_begin_msg "${NAME} is configuring sendsigs..."
-		if [ -f /live/root.pid ] ; then
-			cat /live/root.pid >> /var/run/sendsigs.omit
-		fi
-		log_end_msg 0
-		;;
 
 	stop)
 		log_begin_msg "${NAME} is resyncing snapshots and caching reboot files..."
diff --git a/scripts/live b/scripts/live
index 57a4d32..23d0bbc 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1476,8 +1476,8 @@ setup_unionfs ()
 				unionmountopts="${unionmountopts} ${unionrw}=RW:${unionro}=RO"
 				( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384
 				unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
-					( mkdir -p /run/initramfs
-				pidof unionfs-fuse >> /run/initramfs/sendsigs.omit || true )
+				( mkdir -p /run/sendsigs.omit.d
+				pidof unionfs-fuse >> /run/sendsigs.omit.d/unionfs-fuse || true )
 				;;
 
 			unionmount)

-- 
live-boot



More information about the debian-live-changes mailing list