aboutsummaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
Diffstat (limited to 'libexec')
-rwxr-xr-xlibexec/rc/rc.d/zpoolreguid2
-rwxr-xr-xlibexec/rc/rc.d/zpoolupgrade2
-rw-r--r--libexec/rc/tests/rc_subr_test.sh12
3 files changed, 14 insertions, 2 deletions
diff --git a/libexec/rc/rc.d/zpoolreguid b/libexec/rc/rc.d/zpoolreguid
index f94630d9283f..c19f52d3d702 100755
--- a/libexec/rc/rc.d/zpoolreguid
+++ b/libexec/rc/rc.d/zpoolreguid
@@ -2,7 +2,7 @@
# PROVIDE: zpoolreguid
# REQUIRE: zpool
-# BEFORE: mountcritlocal
+# BEFORE: FILESYSTEMS
# KEYWORD: firstboot nojail
. /etc/rc.subr
diff --git a/libexec/rc/rc.d/zpoolupgrade b/libexec/rc/rc.d/zpoolupgrade
index 1435cba7199c..5e623a9c2bf0 100755
--- a/libexec/rc/rc.d/zpoolupgrade
+++ b/libexec/rc/rc.d/zpoolupgrade
@@ -2,7 +2,7 @@
# PROVIDE: zpoolupgrade
# REQUIRE: zpool
-# BEFORE: mountcritlocal
+# BEFORE: FILESYSTEMS
# KEYWORD: firstboot nojail
. /etc/rc.subr
diff --git a/libexec/rc/tests/rc_subr_test.sh b/libexec/rc/tests/rc_subr_test.sh
index fe6d3b8264c9..9ddd13b61a7c 100644
--- a/libexec/rc/tests/rc_subr_test.sh
+++ b/libexec/rc/tests/rc_subr_test.sh
@@ -26,6 +26,17 @@
# SUCH DAMAGE.
#
+atf_test_case no_cycles
+no_cycles_head()
+{
+ atf_set "descr" "Verify that /etc/rc.d/* contains no cycles"
+}
+
+no_cycles_body()
+{
+ atf_check -e empty -o ignore rcorder /etc/rc.d/*
+}
+
atf_test_case oomprotect_all
oomprotect_all_head()
{
@@ -130,6 +141,7 @@ EOF
atf_init_test_cases()
{
+ atf_add_test_case no_cycles
atf_add_test_case oomprotect_all
atf_add_test_case oomprotect_yes
atf_add_test_case wait_for_pids_progress