Module Name: src
Committed By: martin
Date: Wed Jul 22 16:50:41 UTC 2020
Modified Files:
src/distrib/sets/lists/etc: mi
src/etc: rc
src/etc/rc.d: Makefile bootconf.sh dhcpcd ip6addrctl ipfilter ipsec
iscsid mdnsd mountcritlocal mountcritremote network npf npf_boot pf
pf_boot random_seed route6d smtoff wpa_supplicant
Added Files:
src/etc/rc.d: MOUNTCRITLOCAL clearcritlocal llvmlockdir
Log Message:
Split the local disk availability step into two phases to allow scripts
that pre-populate parts of the system (e.g. a tmpfs based /var) an
easy place to plug in like:
# REQUIRE: mountcritlocal
# BEFORE: MOUNTCRITLOCAL
This also cleans up the existing special handling a bit by separating it
into new scripts. All later scripts now depend on MOUNTCRITLOCAL.
Discussed on tech-userlevel some time ago.
To generate a diff of this commit:
cvs rdiff -u -r1.260 -r1.261 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.173 -r1.174 src/etc/rc
cvs rdiff -u -r0 -r1.1 src/etc/rc.d/MOUNTCRITLOCAL \
src/etc/rc.d/clearcritlocal src/etc/rc.d/llvmlockdir
cvs rdiff -u -r1.106 -r1.107 src/etc/rc.d/Makefile
cvs rdiff -u -r1.16 -r1.17 src/etc/rc.d/bootconf.sh src/etc/rc.d/ipsec
cvs rdiff -u -r1.9 -r1.10 src/etc/rc.d/dhcpcd src/etc/rc.d/mountcritremote \
src/etc/rc.d/route6d
cvs rdiff -u -r1.5 -r1.6 src/etc/rc.d/ip6addrctl src/etc/rc.d/npf \
src/etc/rc.d/pf_boot
cvs rdiff -u -r1.19 -r1.20 src/etc/rc.d/ipfilter
cvs rdiff -u -r1.1 -r1.2 src/etc/rc.d/iscsid
cvs rdiff -u -r1.4 -r1.5 src/etc/rc.d/mdnsd src/etc/rc.d/smtoff
cvs rdiff -u -r1.15 -r1.16 src/etc/rc.d/mountcritlocal
cvs rdiff -u -r1.80 -r1.81 src/etc/rc.d/network
cvs rdiff -u -r1.2 -r1.3 src/etc/rc.d/npf_boot
cvs rdiff -u -r1.12 -r1.13 src/etc/rc.d/pf
cvs rdiff -u -r1.13 -r1.14 src/etc/rc.d/random_seed
cvs rdiff -u -r1.7 -r1.8 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/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.260 src/distrib/sets/lists/etc/mi:1.261
--- src/distrib/sets/lists/etc/mi:1.260 Mon Jun 15 01:57:30 2020
+++ src/distrib/sets/lists/etc/mi Wed Jul 22 16:50:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.260 2020/06/15 01:57:30 christos Exp $
+# $NetBSD: mi,v 1.261 2020/07/22 16:50:41 martin Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked "obsolete"; they should just be removed from
@@ -201,6 +201,7 @@
./etc/rc.d/btuartd etc-obsolete obsolete
./etc/rc.d/ccd etc-sys-rc
./etc/rc.d/cgd etc-sys-rc
+./etc/rc.d/clearcritlocal etc-sys-rc
./etc/rc.d/cleartmp etc-sys-rc
./etc/rc.d/cron etc-cron-rc
./etc/rc.d/devpubd etc-sys-rc
@@ -243,6 +244,7 @@
./etc/rc.d/lkm1 etc-obsolete obsolete
./etc/rc.d/lkm2 etc-obsolete obsolete
./etc/rc.d/lkm3 etc-obsolete obsolete
+./etc/rc.d/llvmlockdir etc-sys-rc
./etc/rc.d/local etc-sys-rc
./etc/rc.d/lpd etc-lpr-rc
./etc/rc.d/lvm etc-sys-rc
@@ -254,6 +256,7 @@
./etc/rc.d/motd etc-sys-rc
./etc/rc.d/mountall etc-sys-rc
./etc/rc.d/mountcritlocal etc-sys-rc
+./etc/rc.d/MOUNTCRITLOCAL etc-sys-rc
./etc/rc.d/mountcritremote etc-sys-rc
./etc/rc.d/mountd etc-nfsserver-rc
./etc/rc.d/moused etc-sysutil-rc
Index: src/etc/rc
diff -u src/etc/rc:1.173 src/etc/rc:1.174
--- src/etc/rc:1.173 Mon Mar 20 16:02:48 2017
+++ src/etc/rc Wed Jul 22 16:50:41 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: rc,v 1.173 2017/03/20 16:02:48 christos Exp $
+# $NetBSD: rc,v 1.174 2020/07/22 16:50:41 martin Exp $
#
# rc --
# Run the scripts in /etc/rc.d with rcorder, and log output
@@ -191,7 +191,7 @@ rc_real_work()
# * Scripts run during the boot may clear /tmp and/var/run, so even
# if they are writable, using those directories too early may be
# problematic. We assume that it's safe to write to our log file
-# after the mountcritlocal script has run.
+# after the MOUNTCRITLOCAL script has run.
#
# * /usr/bin/tee cannot be used because the /usr file system may not
# be mounted early in the boot.
@@ -322,10 +322,10 @@ rc_postprocess_metadata()
printf "%s\n" "$msg"
fi
fi
- # After the mountcritlocal script has finished, it's
+ # After the MOUNTCRITLOCAL script has finished, it's
# OK to flush the log to disk
case "$1" in
- */mountcritlocal)
+ */MOUNTCRITLOCAL)
rc_log_flush OK
;;
esac
Index: src/etc/rc.d/Makefile
diff -u src/etc/rc.d/Makefile:1.106 src/etc/rc.d/Makefile:1.107
--- src/etc/rc.d/Makefile:1.106 Wed Sep 18 05:16:15 2019
+++ src/etc/rc.d/Makefile Wed Jul 22 16:50:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2019/09/18 05:16:15 nonaka Exp $
+# $NetBSD: Makefile,v 1.107 2020/07/22 16:50:41 martin Exp $
.include <bsd.own.mk>
@@ -17,7 +17,7 @@ CONFIGFILES=\
DAEMON DISKS LOGIN NETWORKING SERVERS \
accounting altqd amd apmd automount automountd autounmountd \
bluetooth bootconf.sh bootparams \
- ccd cgd cleartmp cron \
+ ccd cgd clearcritlocal cleartmp cron \
devpubd dhcpcd dhcpd dhcpd6 dhcrelay dmesg \
downinterfaces \
envsys \
@@ -27,9 +27,10 @@ CONFIGFILES=\
identd ifwatchd inetd ip6addrctl ipfilter ipfs ipmon ipnat \
ipsec irdaattach iscsi_target iscsid isibootd \
kdc \
- ldconfig ldpd local lpd lvm \
+ ldconfig ldpd llvmlockdir local lpd lvm \
makemandb mdnsd mixerctl modules mopd motd mountall \
- mountcritlocal mountcritremote mountd moused mrouted \
+ mountcritlocal MOUNTCRITLOCAL \
+ mountcritremote mountd moused mrouted \
named ndbootd network newsyslog nfsd nfslocking npf npf_boot \
npfd ntpd ntpdate \
perusertmp pf pf_boot pflogd postfix powerd ppp pwcheck \
Index: src/etc/rc.d/bootconf.sh
diff -u src/etc/rc.d/bootconf.sh:1.16 src/etc/rc.d/bootconf.sh:1.17
--- src/etc/rc.d/bootconf.sh:1.16 Sat Jul 4 06:24:53 2020
+++ src/etc/rc.d/bootconf.sh Wed Jul 22 16:50:41 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: bootconf.sh,v 1.16 2020/07/04 06:24:53 skrll Exp $
+# $NetBSD: bootconf.sh,v 1.17 2020/07/22 16:50:41 martin Exp $
#
# PROVIDE: bootconf
-# REQUIRE: mountcritlocal
+# REQUIRE: MOUNTCRITLOCAL
# KEYWORD: interactive
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/ipsec
diff -u src/etc/rc.d/ipsec:1.16 src/etc/rc.d/ipsec:1.17
--- src/etc/rc.d/ipsec:1.16 Mon Jan 27 08:28:33 2020
+++ src/etc/rc.d/ipsec Wed Jul 22 16:50:41 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: ipsec,v 1.16 2020/01/27 08:28:33 kim Exp $
+# $NetBSD: ipsec,v 1.17 2020/07/22 16:50:41 martin Exp $
#
# PROVIDE: ipsec
-# REQUIRE: root bootconf mountcritlocal tty
+# REQUIRE: root bootconf MOUNTCRITLOCAL tty
# BEFORE: DAEMON
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/dhcpcd
diff -u src/etc/rc.d/dhcpcd:1.9 src/etc/rc.d/dhcpcd:1.10
--- src/etc/rc.d/dhcpcd:1.9 Sun May 31 12:58:09 2020
+++ src/etc/rc.d/dhcpcd Wed Jul 22 16:50:41 2020
@@ -1,9 +1,9 @@
#!/bin/sh
-# $NetBSD: dhcpcd,v 1.9 2020/05/31 12:58:09 roy Exp $
+# $NetBSD: dhcpcd,v 1.10 2020/07/22 16:50:41 martin Exp $
# PROVIDE: dhcpcd
-# REQUIRE: network mountcritlocal
+# REQUIRE: network MOUNTCRITLOCAL
# BEFORE: NETWORKING
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/mountcritremote
diff -u src/etc/rc.d/mountcritremote:1.9 src/etc/rc.d/mountcritremote:1.10
--- src/etc/rc.d/mountcritremote:1.9 Tue Jul 22 17:11:09 2014
+++ src/etc/rc.d/mountcritremote Wed Jul 22 16:50:41 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: mountcritremote,v 1.9 2014/07/22 17:11:09 wiz Exp $
+# $NetBSD: mountcritremote,v 1.10 2020/07/22 16:50:41 martin Exp $
#
# PROVIDE: mountcritremote
-# REQUIRE: NETWORKING root mountcritlocal
+# REQUIRE: NETWORKING root MOUNTCRITLOCAL
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/route6d
diff -u src/etc/rc.d/route6d:1.9 src/etc/rc.d/route6d:1.10
--- src/etc/rc.d/route6d:1.9 Thu Aug 18 16:46:14 2011
+++ src/etc/rc.d/route6d Wed Jul 22 16:50:41 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: route6d,v 1.9 2011/08/18 16:46:14 uwe Exp $
+# $NetBSD: route6d,v 1.10 2020/07/22 16:50:41 martin Exp $
#
# PROVIDE: route6d
-# REQUIRE: network mountcritlocal
+# REQUIRE: network MOUNTCRITLOCAL
# BEFORE: NETWORKING
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/ip6addrctl
diff -u src/etc/rc.d/ip6addrctl:1.5 src/etc/rc.d/ip6addrctl:1.6
--- src/etc/rc.d/ip6addrctl:1.5 Fri Feb 14 12:12:07 2020
+++ src/etc/rc.d/ip6addrctl Wed Jul 22 16:50:41 2020
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $NetBSD: ip6addrctl,v 1.5 2020/02/14 12:12:07 kim Exp $
+# $NetBSD: ip6addrctl,v 1.6 2020/07/22 16:50:41 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 MOUNTCRITLOCAL tty
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/npf
diff -u src/etc/rc.d/npf:1.5 src/etc/rc.d/npf:1.6
--- src/etc/rc.d/npf:1.5 Sat Jul 4 06:24:53 2020
+++ src/etc/rc.d/npf Wed Jul 22 16:50:41 2020
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $NetBSD: npf,v 1.5 2020/07/04 06:24:53 skrll Exp $
+# $NetBSD: npf,v 1.6 2020/07/22 16:50:41 martin Exp $
#
# Public Domain.
#
# PROVIDE: npf
-# REQUIRE: root bootconf mountcritlocal tty network
+# REQUIRE: root bootconf MOUNTCRITLOCAL 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.5 src/etc/rc.d/pf_boot:1.6
--- src/etc/rc.d/pf_boot:1.5 Sat Oct 5 22:21:29 2019
+++ src/etc/rc.d/pf_boot Wed Jul 22 16:50:41 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: pf_boot,v 1.5 2019/10/05 22:21:29 sevan Exp $
+# $NetBSD: pf_boot,v 1.6 2020/07/22 16:50:41 martin Exp $
#
# PROVIDE: pf_boot
-# REQUIRE: root bootconf mountcritlocal tty
+# REQUIRE: root bootconf MOUNTCRITLOCAL tty
# BEFORE: network
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/ipfilter
diff -u src/etc/rc.d/ipfilter:1.19 src/etc/rc.d/ipfilter:1.20
--- src/etc/rc.d/ipfilter:1.19 Sat Jul 4 06:24:53 2020
+++ src/etc/rc.d/ipfilter Wed Jul 22 16:50:41 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: ipfilter,v 1.19 2020/07/04 06:24:53 skrll Exp $
+# $NetBSD: ipfilter,v 1.20 2020/07/22 16:50:41 martin Exp $
#
# PROVIDE: ipfilter
-# REQUIRE: root bootconf mountcritlocal tty
+# REQUIRE: root bootconf MOUNTCRITLOCAL tty
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/iscsid
diff -u src/etc/rc.d/iscsid:1.1 src/etc/rc.d/iscsid:1.2
--- src/etc/rc.d/iscsid:1.1 Sat Feb 21 23:13:00 2015
+++ src/etc/rc.d/iscsid Wed Jul 22 16:50:41 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: iscsid,v 1.1 2015/02/21 23:13:00 joerg Exp $
+# $NetBSD: iscsid,v 1.2 2020/07/22 16:50:41 martin Exp $
#
# PROVIDE: iscsid
-# REQUIRE: NETWORKING mountcritlocal
+# REQUIRE: NETWORKING MOUNTCRITLOCAL
# BEFORE: securelevel mountcritremote
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/mdnsd
diff -u src/etc/rc.d/mdnsd:1.4 src/etc/rc.d/mdnsd:1.5
--- src/etc/rc.d/mdnsd:1.4 Sat Jul 4 06:24:53 2020
+++ src/etc/rc.d/mdnsd Wed Jul 22 16:50:41 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: mdnsd,v 1.4 2020/07/04 06:24:53 skrll Exp $
+# $NetBSD: mdnsd,v 1.5 2020/07/22 16:50:41 martin Exp $
#
# PROVIDE: mdnsd
-# REQUIRE: network mountcritlocal staticroute
+# REQUIRE: network MOUNTCRITLOCAL staticroute
# BEFORE: NETWORKING
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/smtoff
diff -u src/etc/rc.d/smtoff:1.4 src/etc/rc.d/smtoff:1.5
--- src/etc/rc.d/smtoff:1.4 Mon May 13 18:53:10 2019
+++ src/etc/rc.d/smtoff Wed Jul 22 16:50:41 2020
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $NetBSD: smtoff,v 1.4 2019/05/13 18:53:10 maxv Exp $
+# $NetBSD: smtoff,v 1.5 2020/07/22 16:50:41 martin Exp $
#
# Public Domain.
#
# PROVIDE: smtoff
-# REQUIRE: root bootconf mountcritlocal tty
+# REQUIRE: root bootconf MOUNTCRITLOCAL tty
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/mountcritlocal
diff -u src/etc/rc.d/mountcritlocal:1.15 src/etc/rc.d/mountcritlocal:1.16
--- src/etc/rc.d/mountcritlocal:1.15 Sat Jul 23 01:38:35 2016
+++ src/etc/rc.d/mountcritlocal Wed Jul 22 16:50:41 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountcritlocal,v 1.15 2016/07/23 01:38:35 kre Exp $
+# $NetBSD: mountcritlocal,v 1.16 2020/07/22 16:50:41 martin Exp $
#
# PROVIDE: mountcritlocal
@@ -19,19 +19,6 @@ mountcritlocal_start()
# This usually includes /var.
#
mount_critical_filesystems local || return $?
-
- # clean up left-over files.
- # this could include the cleanup of lock files and /var/run, etc.
- #
- rm -f /etc/nologin /var/spool/lock/LCK.*
- test -d /var/run && (cd /var/run && rm -rf -- *)
-
- # create LVM locking directory, it needs to be owned by operator
- # group and has parmissions to allow lock file creation.
- #
- mkdir -p /var/run/lvm
- chown root:operator /var/run/lvm
- chmod 770 /var/run/lvm
return 0
}
Index: src/etc/rc.d/network
diff -u src/etc/rc.d/network:1.80 src/etc/rc.d/network:1.81
--- src/etc/rc.d/network:1.80 Sat Jul 4 06:24:53 2020
+++ src/etc/rc.d/network Wed Jul 22 16:50:41 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: network,v 1.80 2020/07/04 06:24:53 skrll Exp $
+# $NetBSD: network,v 1.81 2020/07/22 16:50:41 martin Exp $
#
# PROVIDE: network
-# REQUIRE: ipfilter ipsec mountcritlocal root tty sysctl
+# REQUIRE: ipfilter ipsec MOUNTCRITLOCAL 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.2 src/etc/rc.d/npf_boot:1.3
--- src/etc/rc.d/npf_boot:1.2 Sat Oct 5 22:21:29 2019
+++ src/etc/rc.d/npf_boot Wed Jul 22 16:50:41 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: npf_boot,v 1.2 2019/10/05 22:21:29 sevan Exp $
+# $NetBSD: npf_boot,v 1.3 2020/07/22 16:50:41 martin Exp $
#
# PROVIDE: npf_boot
-# REQUIRE: root bootconf mountcritlocal tty
+# REQUIRE: root bootconf MOUNTCRITLOCAL tty
# BEFORE: network
$_rc_subr_loaded . /etc/rc.subr
Index: src/etc/rc.d/pf
diff -u src/etc/rc.d/pf:1.12 src/etc/rc.d/pf:1.13
--- src/etc/rc.d/pf:1.12 Sat Jul 4 06:24:53 2020
+++ src/etc/rc.d/pf Wed Jul 22 16:50:41 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: pf,v 1.12 2020/07/04 06:24:53 skrll Exp $
+# $NetBSD: pf,v 1.13 2020/07/22 16:50:41 martin Exp $
#
# PROVIDE: pf
-# REQUIRE: root bootconf mountcritlocal tty network dhcpcd
+# REQUIRE: root bootconf MOUNTCRITLOCAL 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.13 src/etc/rc.d/random_seed:1.14
--- src/etc/rc.d/random_seed:1.13 Thu May 7 20:01:04 2020
+++ src/etc/rc.d/random_seed Wed Jul 22 16:50:41 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: random_seed,v 1.13 2020/05/07 20:01:04 riastradh Exp $
+# $NetBSD: random_seed,v 1.14 2020/07/22 16:50:41 martin Exp $
#
# PROVIDE: random_seed
-# REQUIRE: mountcritlocal
+# REQUIRE: MOUNTCRITLOCAL
# BEFORE: securelevel
# BEFORE: bootconf
# KEYWORD: shutdown
Index: src/etc/rc.d/wpa_supplicant
diff -u src/etc/rc.d/wpa_supplicant:1.7 src/etc/rc.d/wpa_supplicant:1.8
--- src/etc/rc.d/wpa_supplicant:1.7 Fri Jun 29 12:34:15 2018
+++ src/etc/rc.d/wpa_supplicant Wed Jul 22 16:50:41 2020
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: wpa_supplicant,v 1.7 2018/06/29 12:34:15 roy Exp $
+# $NetBSD: wpa_supplicant,v 1.8 2020/07/22 16:50:41 martin Exp $
#
# PROVIDE: wpa_supplicant
-# REQUIRE: network mountcritlocal
+# REQUIRE: network MOUNTCRITLOCAL
# BEFORE: NETWORKING dhcpcd
#
# We need to run a command that resides in /usr/sbin, and the
Added files:
Index: src/etc/rc.d/MOUNTCRITLOCAL
diff -u /dev/null src/etc/rc.d/MOUNTCRITLOCAL:1.1
--- /dev/null Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/MOUNTCRITLOCAL Wed Jul 22 16:50:41 2020
@@ -0,0 +1,10 @@
+#!/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
Index: src/etc/rc.d/clearcritlocal
diff -u /dev/null src/etc/rc.d/clearcritlocal:1.1
--- /dev/null Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/clearcritlocal Wed Jul 22 16:50:41 2020
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $NetBSD: clearcritlocal,v 1.1 2020/07/22 16:50:41 martin Exp $
+#
+
+# REQUIRE: mountcritlocal
+# BEFORE: MOUNTCRITLOCAL
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="clearcritlocal"
+start_cmd="clearcritlocal_start"
+stop_cmd=":"
+
+clearcritlocal_start()
+{
+ # clean up left-over files.
+ # this could include the cleanup of lock files and /var/run, etc.
+ #
+ rm -f /etc/nologin /var/spool/lock/LCK.*
+ test -d /var/run && (cd /var/run && rm -rf -- *)
+ return 0
+}
+
+load_rc_config $name
+run_rc_command "$1"
Index: src/etc/rc.d/llvmlockdir
diff -u /dev/null src/etc/rc.d/llvmlockdir:1.1
--- /dev/null Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/llvmlockdir Wed Jul 22 16:50:41 2020
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $NetBSD: llvmlockdir,v 1.1 2020/07/22 16:50:41 martin Exp $
+#
+
+# REQUIRE: mountcritlocal
+# BEFORE: MOUNTCRITLOCAL
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="llvmlockdir"
+start_cmd="llvmlockdir_start"
+stop_cmd=":"
+
+llvmlockdir_start()
+{
+ # create LVM locking directory, it needs to be owned by operator
+ # group and has parmissions to allow lock file creation.
+ #
+ mkdir -p /var/run/lvm
+ chown root:operator /var/run/lvm
+ chmod 770 /var/run/lvm
+ return 0
+}
+
+load_rc_config $name
+run_rc_command "$1"
