From 37553aee8bbf9550c838d1810706b54b457c6680 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Mon, 7 Jun 2010 15:24:37 +0200 Subject: [PATCH] Using sendsigs.omit to avoid killing / (Closes: #584690). --- debian/live-boot.init | 12 +++++++++--- scripts/live | 4 ++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/live-boot.init b/debian/live-boot.init index bb079ee..c8c4820 100644 --- a/debian/live-boot.init +++ b/debian/live-boot.init @@ -2,12 +2,12 @@ ### BEGIN INIT INFO # Provides: live-boot -# Required-Start: $syslog +# Required-Start: $syslog bootmisc # Required-Stop: # Should-Start: $local_fs # Should-Stop: halt reboot # X-Stop-After: umountroot -# Default-Start: +# Default-Start: S # Default-Stop: 0 6 # Short-Description: live-boot init script # Description: Resyncs snapshots, evantually caches files in order to @@ -201,8 +201,14 @@ case "${1}" in restart|reload|force-reload|status) [ "${VERBOSE}" != no ] && log_end_msg 0 ;; + start) + log_begin_msg "${NAME} is configuring sendsigs..." + if [ -f /live/image/root.pid ] ; then + cat /live/image/root.pid >> /var/run/sendsigs.omit + fi + ;; - start|stop) + stop) log_begin_msg "${NAME} is resyncing snapshots and caching reboot files..." do_stop diff --git a/scripts/live b/scripts/live index c525c80..7ee3e7f 100755 --- a/scripts/live +++ b/scripts/live @@ -746,6 +746,7 @@ do_httpmount () fi modprobe fuse $FUSE_MOUNT "${url}" "${dest}" + FUSE_PID="$(minips h -C "$FUSE_MOUNT" | { read x y ; echo "$x" ; } )" fi [ ${?} -eq 0 ] && rc=0 [ "${extension}" = "tgz" ] && live_dest="ram" @@ -776,6 +777,9 @@ 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} -- 2.11.4.GIT