Module Name: src
Committed By: mlelstv
Date: Tue Aug 3 05:15:20 UTC 2021
Modified Files:
src/etc/rc.d: ccd cgd devpubd lvm raidframe zfs
Log Message:
Reverse devpubd dependeny to avoid dangling reference to zfs which is
an optional part of the build.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/etc/rc.d/ccd
cvs rdiff -u -r1.8 -r1.9 src/etc/rc.d/cgd
cvs rdiff -u -r1.2 -r1.3 src/etc/rc.d/devpubd
cvs rdiff -u -r1.6 -r1.7 src/etc/rc.d/lvm
cvs rdiff -u -r1.10 -r1.11 src/etc/rc.d/raidframe
cvs rdiff -u -r1.5 -r1.6 src/etc/rc.d/zfs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/ccd
diff -u src/etc/rc.d/ccd:1.7 src/etc/rc.d/ccd:1.8
--- src/etc/rc.d/ccd:1.7 Tue Apr 5 02:52:27 2011
+++ src/etc/rc.d/ccd Tue Aug 3 05:15:20 2021
@@ -1,9 +1,10 @@
#!/bin/sh
#
-# $NetBSD: ccd,v 1.7 2011/04/05 02:52:27 enami Exp $
+# $NetBSD: ccd,v 1.8 2021/08/03 05:15:20 mlelstv Exp $
#
# PROVIDE: ccd
+# REQUIRE: devpubd
# BEFORE: DISKS
# KEYWORD: shutdown
Index: src/etc/rc.d/cgd
diff -u src/etc/rc.d/cgd:1.8 src/etc/rc.d/cgd:1.9
--- src/etc/rc.d/cgd:1.8 Mon Nov 1 14:41:11 2010
+++ src/etc/rc.d/cgd Tue Aug 3 05:15:20 2021
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: cgd,v 1.8 2010/11/01 14:41:11 christos Exp $
+# $NetBSD: cgd,v 1.9 2021/08/03 05:15:20 mlelstv Exp $
#
# PROVIDE: cgd
-# REQUIRE: rndctl
+# REQUIRE: rndctl devpubd
# BEFORE: DISKS
# KEYWORD: interactive
Index: src/etc/rc.d/devpubd
diff -u src/etc/rc.d/devpubd:1.2 src/etc/rc.d/devpubd:1.3
--- src/etc/rc.d/devpubd:1.2 Sat Jul 31 14:47:04 2021
+++ src/etc/rc.d/devpubd Tue Aug 3 05:15:20 2021
@@ -1,11 +1,10 @@
#!/bin/sh
#
-# $NetBSD: devpubd,v 1.2 2021/07/31 14:47:04 mlelstv Exp $
+# $NetBSD: devpubd,v 1.3 2021/08/03 05:15:20 mlelstv Exp $
#
# PROVIDE: devpubd
# REQUIRE: root
-# BEFORE: zfs ccd cgd lvm raidframe
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/lvm
diff -u src/etc/rc.d/lvm:1.6 src/etc/rc.d/lvm:1.7
--- src/etc/rc.d/lvm:1.6 Sat Jul 4 06:24:53 2020
+++ src/etc/rc.d/lvm Tue Aug 3 05:15:20 2021
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: lvm,v 1.6 2020/07/04 06:24:53 skrll Exp $
+# $NetBSD: lvm,v 1.7 2021/08/03 05:15:20 mlelstv Exp $
#
# PROVIDE: lvm
-# REQUIRE: root
+# REQUIRE: root devpubd
# BEFORE: DISKS
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/raidframe
diff -u src/etc/rc.d/raidframe:1.10 src/etc/rc.d/raidframe:1.11
--- src/etc/rc.d/raidframe:1.10 Tue Apr 21 16:08:57 2009
+++ src/etc/rc.d/raidframe Tue Aug 3 05:15:20 2021
@@ -1,9 +1,10 @@
#!/bin/sh
#
-# $NetBSD: raidframe,v 1.10 2009/04/21 16:08:57 joerg Exp $
+# $NetBSD: raidframe,v 1.11 2021/08/03 05:15:20 mlelstv Exp $
#
# PROVIDE: raidframe
+# REQUIRE: devpubd
# BEFORE: DISKS
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/zfs
diff -u src/etc/rc.d/zfs:1.5 src/etc/rc.d/zfs:1.6
--- src/etc/rc.d/zfs:1.5 Mon Dec 9 00:11:32 2019
+++ src/etc/rc.d/zfs Tue Aug 3 05:15:20 2021
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: zfs,v 1.5 2019/12/09 00:11:32 sevan Exp $
+# $NetBSD: zfs,v 1.6 2021/08/03 05:15:20 mlelstv Exp $
#
# PROVIDE: zfs
-# REQUIRE: root
+# REQUIRE: root devpubd
# BEFORE: DISKS
$_rc_subr_loaded . /etc/rc.subr