From cc311639d73915cf959db3bbf2a056598aceacca Mon Sep 17 00:00:00 2001
From: Jacek Konieczny <jajcus@pld-linux.org>
Date: Mon, 10 May 2010 10:21:09 +0000
Subject: [PATCH] - --no-wait when emitting some signals, to prevent lock-ups
 on minor errors ('starting' events need to wait or they won't be useful)

svn-id: @11418
---
 rc.d/init.d/network |  4 ++--
 rc.d/init.d/random  |  4 ++--
 rc.d/rc.sysinit     | 22 +++++++++++-----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 4311b969..ba783b8f 100644
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -213,7 +213,7 @@ start() {
 	network_postinit
 
 	touch /var/lock/subsys/network
-	emit pld.network-started
+	emit --no-wait pld.network-started
 }
 
 stop() {
@@ -253,7 +253,7 @@ stop() {
 	network_deinit
 
 	rm -f /var/lock/subsys/network
-	emit pld.network-stopped
+	emit --no-wait pld.network-stopped
 }
 
 # Reload all active interfaces
diff --git a/rc.d/init.d/random b/rc.d/init.d/random
index 046005ad..645a3b26 100644
--- a/rc.d/init.d/random
+++ b/rc.d/init.d/random
@@ -39,7 +39,7 @@ case "$1" in
 		touch /var/lock/subsys/random
 		deltext
 		ok
-		emit started JOB=random
+		emit --nowait started JOB=random
 	fi
 	;;
   stop)
@@ -55,7 +55,7 @@ case "$1" in
 		rm -f /var/lock/subsys/random
 		deltext
 		ok
-		emit stopped JOB=random
+		emit --no-wait stopped JOB=random
 	fi
 	;;
   status)
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index ba4e44bc..e6d7be0b 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -524,8 +524,8 @@ if ! is_yes "$VSERVER"; then
 		mount -f -t cpuset none /dev/cpuset
 	fi
 	
-	emit root-filesystem
-	emit virtual-filesystems
+	emit --no-wait root-filesystem
+	emit --no-wait virtual-filesystems
 
 	if [ ! -f /proc/modules ]; then
 		USEMODULES=
@@ -892,11 +892,11 @@ if ! is_yes "$VSERVER"; then
 		run_cmd "Turning on quotas for local filesystems" /sbin/quotaon -aug
 	fi
 
-	emit local-filesystems
+	emit --no-wait local-filesystems
 
 	# FIXME: this should be delayed until remote filesystems are mounted,
 	#        especialy when /usr or other standard fs is remote
-	emit filesystem
+	emit --no-wait filesystem
 
 	# Turn on process accounting
 	if [ -x /etc/rc.d/rc.acct ]; then
@@ -923,10 +923,10 @@ if ! is_yes "$VSERVER"; then
 	# ... and here finish configuring parameters
 	sysctl -e -p /etc/sysctl.conf > /dev/null 2>&1
 else
-	emit root-filesystem
-	emit virtual-filesystems
-	emit local-filesystems
-	emit filesystem
+	emit --no-wait root-filesystem
+	emit --no-wait virtual-filesystems
+	emit --no-wait local-filesystems
+	emit --no-wait filesystem
 
 	# /var/log should be writable now, so start saving the boot output
 	if [ "$RC_BOOTLOG" ]; then
@@ -996,7 +996,7 @@ if ! is_yes "$VSERVER"; then
 	run_cmd "Enabling swap space" true
 	# Right, now turn on swap in case we swap to files
 	swapon -a >/dev/null 2>&1
-	emit all-swaps
+	emit --no-wait all-swaps
 
 	# If a SCSI tape has been detected, load the st module unconditionally
 	# since many SCSI tapes don't deal well with st being loaded and unloaded
@@ -1023,7 +1023,7 @@ if ! is_yes "$VSERVER"; then
 	cp -f /var/log/dmesg /var/log/dmesg.0
 	chmod 0600 /var/log/dmesg /var/log/dmesg.0
 else
-	emit all-swaps
+	emit --no-wait all-swaps
 fi
 
 if ! is_no "$RC_PROMPT"; then
@@ -1048,5 +1048,5 @@ if ! is_no "$RC_PROMPT"; then
 fi
 echo
 
-emit pld.sysinit-done
+emit --no-wait pld.sysinit-done
 
-- 
2.44.0