Rename MOUNTCRITLOCAL to CRITLOCALMOUNTED to avoid a name collision

on case insensitive file systems
This commit is contained in:
martin 2020-09-08 12:52:18 +00:00
parent 2647485e8b
commit 0a9098d00f
21 changed files with 42 additions and 42 deletions

4
etc/rc.d/MOUNTCRITLOCAL → etc/rc.d/CRITLOCALMOUNTED Executable file → Normal file
View File

@ -1,10 +1,10 @@
#!/bin/sh
#
# $NetBSD: MOUNTCRITLOCAL,v 1.1 2020/07/22 16:50:41 martin Exp $
# $NetBSD: CRITLOCALMOUNTED,v 1.1 2020/09/08 12:52:18 martin Exp $
#
# REQUIRE: mountcritlocal
# PROVIDE: MOUNTCRITLOCAL
# PROVIDE: CRITLOCALMOUNTED
# This is a dummy dependency, for services which require local
# disks to be mounted and fully setup

View File

@ -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 \

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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