Remove rc_service_wait as runscript.c should do the waiting. rc_deptree_depend now returns the exact depends as listed. This is so we can support a new 'keywords' directive. We can add whatever here, like 'notimeout' which means that an init script doesn't timeout. This removes the hardcoded check on checkfs and checkroot.

4 files changed, 7 insertions, 0 deletions

diff --git a/init.d/bootmisc b/init.d/bootmisc
index 3ac53a2..f57a708 100755
--- a/init.d/bootmisc
+++ b/init.d/bootmisc
@@ -29,6 +29,7 @@ depend() {
 	need localmount
 	before logger
 	after clock sysctl
+	keywords notimeout
 }
 
 cleanup_tmp_dir() {
diff --git a/init.d/checkfs b/init.d/checkfs
index 4174b9b..c29c519 100755
--- a/init.d/checkfs
+++ b/init.d/checkfs
@@ -30,6 +30,7 @@ optionally repair them."
 depend() {
 	need checkroot
 	after modules
+	keywords notimeout
 }
 
 do_checkfs() {
diff --git a/init.d/checkroot b/init.d/checkroot
index 1397374..acfb914 100755
--- a/init.d/checkroot
+++ b/init.d/checkroot
@@ -27,6 +27,10 @@
 description="Check the root filesystem according to /etc/fstab for errors \
 and optionally repair them."
 
+depend() {
+	keywords notimeout
+}
+
 do_mtab() {
 	# Don't create mtab if /etc is readonly
 	if ! printf "" 2>/dev/null >/etc/mtab; then
diff --git a/init.d/local b/init.d/local
index 461b4af..d1c30d4 100755
--- a/init.d/local
+++ b/init.d/local
@@ -29,6 +29,7 @@ and /etc/conf.d/local.stop when stopping."
 
 depend() {
 	after *
+	keywords notimeout
 }
 
 start() {