From f50a4cf27c52db374ffa20148cb5abf686af321f Mon Sep 17 00:00:00 2001 From: Doug Barton Date: Sun, 19 Feb 2006 08:18:48 +0000 Subject: [PATCH] Make sure abi (and therefore archdep) start before SERVERS as part of the ongoing re-alignment of ordering that is necessary as a result of including local scripts in the base rcorder. [1] Accomplish this by removing the BEFORE's, and using REQUIRE instead. This makes the dependencies more obvious, and less susceptible to turning circular and/or nonsensical when seemingly innocent changes are made in one place and not another. Requested by: delphij [1] --- etc/rc.d/SERVERS | 2 +- etc/rc.d/abi | 3 +-- etc/rc.d/archdep | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/etc/rc.d/SERVERS b/etc/rc.d/SERVERS index 48b19a51298..84626b1cae5 100755 --- a/etc/rc.d/SERVERS +++ b/etc/rc.d/SERVERS @@ -5,7 +5,7 @@ # # PROVIDE: SERVERS -# REQUIRE: mountcritremote +# REQUIRE: mountcritremote abi # This is a dummy dependency, for early-start servers relying on # some basic configuration. diff --git a/etc/rc.d/abi b/etc/rc.d/abi index 8b00fbbe958..b012fc33585 100644 --- a/etc/rc.d/abi +++ b/etc/rc.d/abi @@ -4,8 +4,7 @@ # # PROVIDE: abi -# REQUIRE: LOGIN -# BEFORE: securelevel +# REQUIRE: archdep # KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/archdep b/etc/rc.d/archdep index 965b0c9b31e..0d34c43977d 100644 --- a/etc/rc.d/archdep +++ b/etc/rc.d/archdep @@ -4,8 +4,7 @@ # # PROVIDE: archdep -# REQUIRE: LOGIN -# BEFORE: abi +# REQUIRE: mountcritremote # KEYWORD: nojail . /etc/rc.subr