Module Name: src
Committed By: martin
Date: Tue Sep 8 12:52:18 UTC 2020
Modified Files:
src/etc/rc.d: Makefile bootconf.sh clearcritlocal dhcpcd ip6addrctl
ipfilter ipsec iscsid llvmlockdir mdnsd mountcritremote network npf
npf_boot pf pf_boot random_seed route6d smtoff wpa_supplicant
Added Files:
src/etc/rc.d: CRITLOCALMOUNTED
Removed Files:
src/etc/rc.d: MOUNTCRITLOCAL
Log Message:
Rename MOUNTCRITLOCAL to CRITLOCALMOUNTED to avoid a name collision
on case insensitive file systems
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/etc/rc.d/CRITLOCALMOUNTED
cvs rdiff -u -r1.1 -r0 src/etc/rc.d/MOUNTCRITLOCAL
cvs rdiff -u -r1.107 -r1.108 src/etc/rc.d/Makefile
cvs rdiff -u -r1.17 -r1.18 src/etc/rc.d/bootconf.sh src/etc/rc.d/ipsec
cvs rdiff -u -r1.2 -r1.3 src/etc/rc.d/clearcritlocal src/etc/rc.d/iscsid
cvs rdiff -u -r1.10 -r1.11 src/etc/rc.d/dhcpcd src/etc/rc.d/mountcritremote \
src/etc/rc.d/route6d
cvs rdiff -u -r1.6 -r1.7 src/etc/rc.d/ip6addrctl src/etc/rc.d/npf \
src/etc/rc.d/pf_boot
cvs rdiff -u -r1.20 -r1.21 src/etc/rc.d/ipfilter
cvs rdiff -u -r1.1 -r1.2 src/etc/rc.d/llvmlockdir
cvs rdiff -u -r1.5 -r1.6 src/etc/rc.d/mdnsd src/etc/rc.d/smtoff
cvs rdiff -u -r1.81 -r1.82 src/etc/rc.d/network
cvs rdiff -u -r1.3 -r1.4 src/etc/rc.d/npf_boot
cvs rdiff -u -r1.13 -r1.14 src/etc/rc.d/pf
cvs rdiff -u -r1.14 -r1.15 src/etc/rc.d/random_seed
cvs rdiff -u -r1.8 -r1.9 src/etc/rc.d/wpa_supplicant
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/Makefile
diff -u src/etc/rc.d/Makefile:1.107 src/etc/rc.d/Makefile:1.108
--- src/etc/rc.d/Makefile:1.107 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/Makefile Tue Sep 8 12:52:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: Makefile,v 1.108 2020/09/08 12:52:18 martin Exp $
.include <bsd.own.mk>
@@ -29,7 +29,7 @@ CONFIGFILES=\
kdc \
ldconfig ldpd llvmlockdir local lpd lvm \
makemandb mdnsd mixerctl modules mopd motd mountall \
- mountcritlocal MOUNTCRITLOCAL \
+ mountcritlocal CRITLOCALMOUNTED \
mountcritremote mountd moused mrouted \
named ndbootd network newsyslog nfsd nfslocking npf npf_boot \
npfd ntpd ntpdate \
Index: src/etc/rc.d/bootconf.sh
diff -u src/etc/rc.d/bootconf.sh:1.17 src/etc/rc.d/bootconf.sh:1.18
--- src/etc/rc.d/bootconf.sh:1.17 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/bootconf.sh Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: bootconf.sh,v 1.17 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: bootconf.sh,v 1.18 2020/09/08 12:52:18 martin Exp $
#
# PROVIDE: bootconf
-# REQUIRE: MOUNTCRITLOCAL
+# REQUIRE: CRITLOCALMOUNTED
# KEYWORD: interactive
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/ipsec
diff -u src/etc/rc.d/ipsec:1.17 src/etc/rc.d/ipsec:1.18
--- src/etc/rc.d/ipsec:1.17 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/ipsec Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: ipsec,v 1.17 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: ipsec,v 1.18 2020/09/08 12:52:18 martin Exp $
#
# PROVIDE: ipsec
-# REQUIRE: root bootconf MOUNTCRITLOCAL tty
+# REQUIRE: root bootconf CRITLOCALMOUNTED tty
# BEFORE: DAEMON
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/clearcritlocal
diff -u src/etc/rc.d/clearcritlocal:1.2 src/etc/rc.d/clearcritlocal:1.3
--- src/etc/rc.d/clearcritlocal:1.2 Tue Sep 8 12:45:03 2020
+++ src/etc/rc.d/clearcritlocal Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: clearcritlocal,v 1.2 2020/09/08 12:45:03 martin Exp $
+# $NetBSD: clearcritlocal,v 1.3 2020/09/08 12:52:18 martin Exp $
#
# REQUIRE: mountcritlocal
-# BEFORE: MOUNTCRITLOCAL
+# BEFORE: CRITLOCALMOUNTED
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/iscsid
diff -u src/etc/rc.d/iscsid:1.2 src/etc/rc.d/iscsid:1.3
--- src/etc/rc.d/iscsid:1.2 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/iscsid Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: iscsid,v 1.2 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: iscsid,v 1.3 2020/09/08 12:52:18 martin Exp $
#
# PROVIDE: iscsid
-# REQUIRE: NETWORKING MOUNTCRITLOCAL
+# REQUIRE: NETWORKING CRITLOCALMOUNTED
# BEFORE: securelevel mountcritremote
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/dhcpcd
diff -u src/etc/rc.d/dhcpcd:1.10 src/etc/rc.d/dhcpcd:1.11
--- src/etc/rc.d/dhcpcd:1.10 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/dhcpcd Tue Sep 8 12:52:18 2020
@@ -1,9 +1,9 @@
#!/bin/sh
-# $NetBSD: dhcpcd,v 1.10 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: dhcpcd,v 1.11 2020/09/08 12:52:18 martin Exp $
# PROVIDE: dhcpcd
-# REQUIRE: network MOUNTCRITLOCAL
+# REQUIRE: network CRITLOCALMOUNTED
# BEFORE: NETWORKING
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/mountcritremote
diff -u src/etc/rc.d/mountcritremote:1.10 src/etc/rc.d/mountcritremote:1.11
--- src/etc/rc.d/mountcritremote:1.10 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/mountcritremote Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: mountcritremote,v 1.10 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: mountcritremote,v 1.11 2020/09/08 12:52:18 martin Exp $
#
# PROVIDE: mountcritremote
-# REQUIRE: NETWORKING root MOUNTCRITLOCAL
+# REQUIRE: NETWORKING root CRITLOCALMOUNTED
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/route6d
diff -u src/etc/rc.d/route6d:1.10 src/etc/rc.d/route6d:1.11
--- src/etc/rc.d/route6d:1.10 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/route6d Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: route6d,v 1.10 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: route6d,v 1.11 2020/09/08 12:52:18 martin Exp $
#
# PROVIDE: route6d
-# REQUIRE: network MOUNTCRITLOCAL
+# REQUIRE: network CRITLOCALMOUNTED
# BEFORE: NETWORKING
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/ip6addrctl
diff -u src/etc/rc.d/ip6addrctl:1.6 src/etc/rc.d/ip6addrctl:1.7
--- src/etc/rc.d/ip6addrctl:1.6 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/ip6addrctl Tue Sep 8 12:52:18 2020
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $NetBSD: ip6addrctl,v 1.6 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: ip6addrctl,v 1.7 2020/09/08 12:52:18 martin Exp $
# FreeBSD: head/etc/rc.d/ip6addrctl 270836 2014-08-30 07:08:10Z hrs
#
# PROVIDE: ip6addrctl
-# REQUIRE: root bootconf MOUNTCRITLOCAL tty
+# REQUIRE: root bootconf CRITLOCALMOUNTED tty
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/npf
diff -u src/etc/rc.d/npf:1.6 src/etc/rc.d/npf:1.7
--- src/etc/rc.d/npf:1.6 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/npf Tue Sep 8 12:52:18 2020
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $NetBSD: npf,v 1.6 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: npf,v 1.7 2020/09/08 12:52:18 martin Exp $
#
# Public Domain.
#
# PROVIDE: npf
-# REQUIRE: root bootconf MOUNTCRITLOCAL tty network
+# REQUIRE: root bootconf CRITLOCALMOUNTED tty network
# BEFORE: NETWORKING
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/pf_boot
diff -u src/etc/rc.d/pf_boot:1.6 src/etc/rc.d/pf_boot:1.7
--- src/etc/rc.d/pf_boot:1.6 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/pf_boot Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: pf_boot,v 1.6 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: pf_boot,v 1.7 2020/09/08 12:52:18 martin Exp $
#
# PROVIDE: pf_boot
-# REQUIRE: root bootconf MOUNTCRITLOCAL tty
+# REQUIRE: root bootconf CRITLOCALMOUNTED tty
# BEFORE: network
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/ipfilter
diff -u src/etc/rc.d/ipfilter:1.20 src/etc/rc.d/ipfilter:1.21
--- src/etc/rc.d/ipfilter:1.20 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/ipfilter Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: ipfilter,v 1.20 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: ipfilter,v 1.21 2020/09/08 12:52:18 martin Exp $
#
# PROVIDE: ipfilter
-# REQUIRE: root bootconf MOUNTCRITLOCAL tty
+# REQUIRE: root bootconf CRITLOCALMOUNTED tty
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/llvmlockdir
diff -u src/etc/rc.d/llvmlockdir:1.1 src/etc/rc.d/llvmlockdir:1.2
--- src/etc/rc.d/llvmlockdir:1.1 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/llvmlockdir Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: llvmlockdir,v 1.1 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: llvmlockdir,v 1.2 2020/09/08 12:52:18 martin Exp $
#
# REQUIRE: mountcritlocal
-# BEFORE: MOUNTCRITLOCAL
+# BEFORE: CRITLOCALMOUNTED
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/mdnsd
diff -u src/etc/rc.d/mdnsd:1.5 src/etc/rc.d/mdnsd:1.6
--- src/etc/rc.d/mdnsd:1.5 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/mdnsd Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: mdnsd,v 1.5 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: mdnsd,v 1.6 2020/09/08 12:52:18 martin Exp $
#
# PROVIDE: mdnsd
-# REQUIRE: network MOUNTCRITLOCAL staticroute
+# REQUIRE: network CRITLOCALMOUNTED staticroute
# BEFORE: NETWORKING
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/smtoff
diff -u src/etc/rc.d/smtoff:1.5 src/etc/rc.d/smtoff:1.6
--- src/etc/rc.d/smtoff:1.5 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/smtoff Tue Sep 8 12:52:18 2020
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $NetBSD: smtoff,v 1.5 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: smtoff,v 1.6 2020/09/08 12:52:18 martin Exp $
#
# Public Domain.
#
# PROVIDE: smtoff
-# REQUIRE: root bootconf MOUNTCRITLOCAL tty
+# REQUIRE: root bootconf CRITLOCALMOUNTED tty
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/network
diff -u src/etc/rc.d/network:1.81 src/etc/rc.d/network:1.82
--- src/etc/rc.d/network:1.81 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/network Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: network,v 1.81 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: network,v 1.82 2020/09/08 12:52:18 martin Exp $
#
# PROVIDE: network
-# REQUIRE: ipfilter ipsec MOUNTCRITLOCAL root tty sysctl
+# REQUIRE: ipfilter ipsec CRITLOCALMOUNTED root tty sysctl
# BEFORE: NETWORKING
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/npf_boot
diff -u src/etc/rc.d/npf_boot:1.3 src/etc/rc.d/npf_boot:1.4
--- src/etc/rc.d/npf_boot:1.3 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/npf_boot Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: npf_boot,v 1.3 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: npf_boot,v 1.4 2020/09/08 12:52:18 martin Exp $
#
# PROVIDE: npf_boot
-# REQUIRE: root bootconf MOUNTCRITLOCAL tty
+# REQUIRE: root bootconf CRITLOCALMOUNTED tty
# BEFORE: network
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/pf
diff -u src/etc/rc.d/pf:1.13 src/etc/rc.d/pf:1.14
--- src/etc/rc.d/pf:1.13 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/pf Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: pf,v 1.13 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: pf,v 1.14 2020/09/08 12:52:18 martin Exp $
#
# PROVIDE: pf
-# REQUIRE: root bootconf MOUNTCRITLOCAL tty network dhcpcd
+# REQUIRE: root bootconf CRITLOCALMOUNTED tty network dhcpcd
# BEFORE: NETWORKING
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/random_seed
diff -u src/etc/rc.d/random_seed:1.14 src/etc/rc.d/random_seed:1.15
--- src/etc/rc.d/random_seed:1.14 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/random_seed Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: random_seed,v 1.14 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: random_seed,v 1.15 2020/09/08 12:52:18 martin Exp $
#
# PROVIDE: random_seed
-# REQUIRE: MOUNTCRITLOCAL
+# REQUIRE: CRITLOCALMOUNTED
# BEFORE: securelevel
# BEFORE: bootconf
# KEYWORD: shutdown
Index: src/etc/rc.d/wpa_supplicant
diff -u src/etc/rc.d/wpa_supplicant:1.8 src/etc/rc.d/wpa_supplicant:1.9
--- src/etc/rc.d/wpa_supplicant:1.8 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/wpa_supplicant Tue Sep 8 12:52:18 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: wpa_supplicant,v 1.8 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: wpa_supplicant,v 1.9 2020/09/08 12:52:18 martin Exp $
#
# PROVIDE: wpa_supplicant
-# REQUIRE: network MOUNTCRITLOCAL
+# REQUIRE: network CRITLOCALMOUNTED
# BEFORE: NETWORKING dhcpcd
#
# We need to run a command that resides in /usr/sbin, and the
Added files:
Index: src/etc/rc.d/CRITLOCALMOUNTED
diff -u /dev/null src/etc/rc.d/CRITLOCALMOUNTED:1.1
--- /dev/null Tue Sep 8 12:52:18 2020
+++ src/etc/rc.d/CRITLOCALMOUNTED Tue Sep 8 12:52:18 2020
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# $NetBSD: CRITLOCALMOUNTED,v 1.1 2020/09/08 12:52:18 martin Exp $
+#
+
+# REQUIRE: mountcritlocal
+# PROVIDE: CRITLOCALMOUNTED
+
+# This is a dummy dependency, for services which require local
+# disks to be mounted and fully setup
