[src/trunk]: src/etc/rc.d Rename MOUNTCRITLOCAL to CRITLOCALMOUNTED to avoid ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/etc/rc.d Rename MOUNTCRITLOCAL to CRITLOCALMOUNTED to avoid ...
From: martin <martin%NetBSD.org@localhost>
Date: Tue, 08 Sep 2020 15:43:16 +0000
details:   https://anonhg.NetBSD.org/src/rev/51c660137a47
branches:  trunk
changeset: 938438:51c660137a47
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Sep 08 12:52:18 2020 +0000

description:
Rename MOUNTCRITLOCAL to CRITLOCALMOUNTED to avoid a name collision
on case insensitive file systems

diffstat:

 etc/rc.d/CRITLOCALMOUNTED |  10 ++++++++++
 etc/rc.d/MOUNTCRITLOCAL   |  10 ----------
 etc/rc.d/Makefile         |   4 ++--
 etc/rc.d/bootconf.sh      |   4 ++--
 etc/rc.d/clearcritlocal   |   4 ++--
 etc/rc.d/dhcpcd           |   4 ++--
 etc/rc.d/ip6addrctl       |   4 ++--
 etc/rc.d/ipfilter         |   4 ++--
 etc/rc.d/ipsec            |   4 ++--
 etc/rc.d/iscsid           |   4 ++--
 etc/rc.d/llvmlockdir      |   4 ++--
 etc/rc.d/mdnsd            |   4 ++--
 etc/rc.d/mountcritremote  |   4 ++--
 etc/rc.d/network          |   4 ++--
 etc/rc.d/npf              |   4 ++--
 etc/rc.d/npf_boot         |   4 ++--
 etc/rc.d/pf               |   4 ++--
 etc/rc.d/pf_boot          |   4 ++--
 etc/rc.d/random_seed      |   4 ++--
 etc/rc.d/route6d          |   4 ++--
 etc/rc.d/smtoff           |   4 ++--
 etc/rc.d/wpa_supplicant   |   4 ++--
 22 files changed, 50 insertions(+), 50 deletions(-)

diffs (truncated from 354 to 300 lines):

diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/CRITLOCALMOUNTED
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/rc.d/CRITLOCALMOUNTED Tue Sep 08 12:52:18 2020 +0000
@@ -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
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/MOUNTCRITLOCAL
--- a/etc/rc.d/MOUNTCRITLOCAL   Tue Sep 08 12:45:03 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: MOUNTCRITLOCAL,v 1.1 2020/07/22 16:50:41 martin Exp $
-#
-
-# REQUIRE: mountcritlocal
-# PROVIDE: MOUNTCRITLOCAL
-
-#      This is a dummy dependency, for services which require local
-#      disks to be mounted and fully setup
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/Makefile
--- a/etc/rc.d/Makefile Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/Makefile Tue Sep 08 12:52:18 2020 +0000
@@ -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 @@
                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 \
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/bootconf.sh
--- a/etc/rc.d/bootconf.sh      Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/bootconf.sh      Tue Sep 08 12:52:18 2020 +0000
@@ -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
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/clearcritlocal
--- a/etc/rc.d/clearcritlocal   Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/clearcritlocal   Tue Sep 08 12:52:18 2020 +0000
@@ -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
 
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/dhcpcd
--- a/etc/rc.d/dhcpcd   Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/dhcpcd   Tue Sep 08 12:52:18 2020 +0000
@@ -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
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/ip6addrctl
--- a/etc/rc.d/ip6addrctl       Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/ip6addrctl       Tue Sep 08 12:52:18 2020 +0000
@@ -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
 
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/ipfilter
--- a/etc/rc.d/ipfilter Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/ipfilter Tue Sep 08 12:52:18 2020 +0000
@@ -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
 
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/ipsec
--- a/etc/rc.d/ipsec    Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/ipsec    Tue Sep 08 12:52:18 2020 +0000
@@ -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
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/iscsid
--- a/etc/rc.d/iscsid   Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/iscsid   Tue Sep 08 12:52:18 2020 +0000
@@ -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
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/llvmlockdir
--- a/etc/rc.d/llvmlockdir      Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/llvmlockdir      Tue Sep 08 12:52:18 2020 +0000
@@ -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
 
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/mdnsd
--- a/etc/rc.d/mdnsd    Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/mdnsd    Tue Sep 08 12:52:18 2020 +0000
@@ -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
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/mountcritremote
--- a/etc/rc.d/mountcritremote  Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/mountcritremote  Tue Sep 08 12:52:18 2020 +0000
@@ -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
 
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/network
--- a/etc/rc.d/network  Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/network  Tue Sep 08 12:52:18 2020 +0000
@@ -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
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/npf
--- a/etc/rc.d/npf      Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/npf      Tue Sep 08 12:52:18 2020 +0000
@@ -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
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/npf_boot
--- a/etc/rc.d/npf_boot Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/npf_boot Tue Sep 08 12:52:18 2020 +0000
@@ -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
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/pf
--- a/etc/rc.d/pf       Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/pf       Tue Sep 08 12:52:18 2020 +0000
@@ -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
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/pf_boot
--- a/etc/rc.d/pf_boot  Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/pf_boot  Tue Sep 08 12:52:18 2020 +0000
@@ -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
diff -r 21fa15f24ea5 -r 51c660137a47 etc/rc.d/random_seed
--- a/etc/rc.d/random_seed      Tue Sep 08 12:45:03 2020 +0000
+++ b/etc/rc.d/random_seed      Tue Sep 08 12:52:18 2020 +0000
@@ -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
Prev by Date: [src/trunk]: src/etc/rc.d Make it work with empty /var
Next by Date: [src/trunk]: src/distrib/sets/lists/etc Adjust for MOUNTCRITLOCAL -> CRITLOCA...
Previous by Thread: [src/trunk]: src/etc/rc.d Make it work with empty /var
Next by Thread: [src/trunk]: src/distrib/sets/lists/etc Adjust for MOUNTCRITLOCAL -> CRITLOCA...
Indexes:
Home | Main Index | Thread Index | Old Index