 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: bootconf.sh,v 1.15 2012/12/31 23:21:27 christos Exp $
+# $NetBSD: bootconf.sh,v 1.16 2020/07/04 06:24:53 skrll Exp $
+#
 # PROVIDE: bootconf
 # REQUIRE: mountcritlocal
 # KEYWORD: interactive
 $_rc_subr_loaded . /etc/rc.subr
 name="bootconf"
 start_cmd="bootconf_start"
 stop_cmd=":"
 bootconf_start()
 @@ -28,27 +28,27 @@ bootconf_start()
 		default=current
 	fi
 	if [ "$default" = "current" ]; then
 		def=$(ls -ld /etc/etc.current 2>&1)
 		default="${def##*-> *etc.}"
 	fi
 	spc=""
 	for i in /etc/etc.*; do
 		name="${i##/etc/etc.}"
 		case $name in
 		current|default|\*)
 			continue
 			;;
 		*)
 			if [ "$name" = "$default" ]; then
 				echo -n "${spc}[${name}]"
 			else
 				echo -n "${spc}${name}"
 			fi
 			spc=" "
 			;;
 		esac
 	done
 	echo
 	_DUMMY=/etc/passwd
 	conf=${_DUMMY}

 @@ -1,27 +1,27 @@
 #!/bin/sh
+#
-# $NetBSD: mdnsd,v 1.3 2015/10/15 16:47:28 roy Exp $
+# $NetBSD: mdnsd,v 1.4 2020/07/04 06:24:53 skrll Exp $
+#
 # PROVIDE: mdnsd
 # REQUIRE: network mountcritlocal staticroute
 # BEFORE:  NETWORKING
 $_rc_subr_loaded . /etc/rc.subr
 name="mdnsd"
 rcvar=$name
 command="/usr/sbin/$name"
 pidfile="/var/run/mdnsd/${name}.pid"
 start_precmd="mdnsd_precmd"
 mdnsd_precmd()
+{
     if [ ! -d /var/run/mdnsd ]; then
         mkdir -p -m 755 /var/run/mdnsd
     fi
     chown _mdnsd:_mdnsd /var/run/mdnsd
+}
 load_rc_config $name
 run_rc_command "$1"

	@@ -1,16 +1,16 @@		@@ -1,16 +1,16 @@
1	#!/bin/sh	1	#!/bin/sh
2	#	2	#
3	# $NetBSD: ipfilter,v 1.18 2009/03/23 18:52:02 hannken Exp $	3	# $NetBSD: ipfilter,v 1.19 2020/07/04 06:24:53 skrll Exp $
4	#	4	#
5		5
6	# PROVIDE: ipfilter	6	# PROVIDE: ipfilter
7	# REQUIRE: root bootconf mountcritlocal tty	7	# REQUIRE: root bootconf mountcritlocal tty
8		8
9	$_rc_subr_loaded . /etc/rc.subr	9	$_rc_subr_loaded . /etc/rc.subr
10		10
11	name="ipfilter"	11	name="ipfilter"
12	rcvar=$name	12	rcvar=$name
13	start_precmd="ipfilter_prestart"	13	start_precmd="ipfilter_prestart"
14	start_cmd="ipfilter_start"	14	start_cmd="ipfilter_start"
15	stop_precmd="test -f /etc/ipf.conf -o -f /etc/ipf6.conf"	15	stop_precmd="test -f /etc/ipf.conf -o -f /etc/ipf6.conf"
16	stop_cmd="ipfilter_stop"	16	stop_cmd="ipfilter_stop"
	@@ -74,27 +74,27 @@ ipfilter_reload()		@@ -74,27 +74,27 @@ ipfilter_reload()
74	fi	74	fi
75	if [ -f /etc/ipf6.conf ]; then	75	if [ -f /etc/ipf6.conf ]; then
76	/sbin/ipf -6 -I -Fa	76	/sbin/ipf -6 -I -Fa
77	fi	77	fi
78		78
79	# Now load the config files into the Inactive set	79	# Now load the config files into the Inactive set
80	#	80	#
81	if [ -f /etc/ipf.conf ] && ! /sbin/ipf -I -f /etc/ipf.conf; then	81	if [ -f /etc/ipf.conf ] && ! /sbin/ipf -I -f /etc/ipf.conf; then
82	err 1 "reload of ipf.conf failed; not swapping to new ruleset."	82	err 1 "reload of ipf.conf failed; not swapping to new ruleset."
83	fi	83	fi
84	if [ -f /etc/ipf6.conf ] && ! /sbin/ipf -I -6 -f /etc/ipf6.conf; then	84	if [ -f /etc/ipf6.conf ] && ! /sbin/ipf -I -6 -f /etc/ipf6.conf; then
85	err 1 "reload of ipf6.conf failed; not swapping to new ruleset."	85	err 1 "reload of ipf6.conf failed; not swapping to new ruleset."
86	fi	86	fi
87		87
88	# Swap in the new rules	88	# Swap in the new rules
89	#	89	#
90	/sbin/ipf -s	90	/sbin/ipf -s
91	}	91	}
92		92
93	ipfilter_resync()	93	ipfilter_resync()
94	{	94	{
95	/sbin/ipf -y	95	/sbin/ipf -y
96	}	96	}
97		97
98	ipfilter_status()	98	ipfilter_status()
99	{	99	{
100	/sbin/ipf -V	100	/sbin/ipf -V

 @@ -1,90 +1,90 @@
 #!/bin/sh
+#
-# $NetBSD: lvm,v 1.5 2009/04/21 16:08:57 joerg Exp $
+# $NetBSD: lvm,v 1.6 2020/07/04 06:24:53 skrll Exp $
+#
 # PROVIDE: lvm
 # REQUIRE: root
 # BEFORE:  DISKS
 $_rc_subr_loaded . /etc/rc.subr
 name="lvm"
 rcvar=$name
 start_cmd="lvm_start"
 stop_cmd="lvm_stop"
 ifs_restore="$IFS";
 lvm_start()
+{
 	if [ -x /sbin/dmsetup ]; then
 		/sbin/dmsetup version >/dev/null
 		if [ $? -ne 0 ]; then
 			warn "Device-mapper not present in kernel"
 			return 1;
 		fi
 	fi
 	if [ -x /sbin/lvm ]; then
 		echo "Configuring lvm devices."
 		# Scan for all available VG's
 		/sbin/lvm vgscan --mknodes --ignorelockingfailure >/dev/null
 		# Activate all LV's and create apropriate nodes in /dev
 		/sbin/lvm vgchange --ignorelockingfailure -a y >/dev/null
 		LV_LIST=$(/sbin/lvm vgdisplay -C -o vg_name --noheadings 2>/dev/null)
 		echo " Activated Volume Groups:" $LV_LIST
 	fi
+}
 lvm_stop()
+{
 	if [ -x /sbin/dmsetup ]; then
 		/sbin/dmsetup version >/dev/null
 		if [ $? -ne 0 ]; then
 			warn "Device-mapper not present in kernel"
 			return 1;
 		fi
 	fi
 	if [ -x /sbin/lvm ]; then
 		echo "Unconfiguring lvm devices."
 		LOGICAL_VOLUMES=$(/sbin/lvm lvdisplay -C -o vg_name,lv_name \
 			-O vg_name --separator \/ --noheadings 2>/dev/null)
 		VOLUME_GROUPS=$(/sbin/lvm vgdisplay -C -o vg_name \
 			--separator " " --noheadings 2>/dev/null)
 		for lv in ${LOGICAL_VOLUMES}; do
 			LV_IS_ACTIVE=$(/sbin/lvm lvdisplay -C --noheadings \
 				-o lv_attr $lv)
 			case $LV_IS_ACTIVE in
 			*a*)
 				echo "  Shutting Down logical volume: ${lv}"
 				/sbin/lvm lvchange -an --ignorelockingfailure \
 					-P ${lv} >/dev/null
 				;;
 			esac
 		done
 		for vg in ${VOLUME_GROUPS}; do
 			# Set IFS to field separator
 			IFS=":"
 			set -- $(/sbin/lvm vgdisplay -cA ${vg} 2>/dev/null)
 			# The seventh parameter is number of opened LVs in a Volume Group
 			VG_HAS_ACTIVE_LV=$7
 			IFS="$ifs_restore";
 			if [ "${VG_HAS_ACTIVE_LV}" = 0 ]; then
 				echo "  Shutting Down volume group: ${vg}"
 				/sbin/lvm vgchange -an --ignorelockingfailure \
 					-P ${vg} >/dev/null
 			fi
 		done
 	fi
+}
 load_rc_config $name
 run_rc_command "$1"

 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: named,v 1.25 2014/07/13 22:06:56 tls Exp $
+# $NetBSD: named,v 1.26 2020/07/04 06:24:53 skrll Exp $
+#
 # PROVIDE: named
 # REQUIRE: NETWORKING mountcritremote syslogd
 # BEFORE:  DAEMON
 # KEYWORD: chrootdir
 $_rc_subr_loaded . /etc/rc.subr
 name="named"
 rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}/${name}.pid"
 @@ -67,54 +67,54 @@ named_precmd()
 		echo "Generating rndc.key"
 		/usr/sbin/rndc-confgen -a
 	fi
 	if [ -z "$named_chrootdir" ]; then
 		if [ ! -d "/etc/namedb/keys" ]; then
 			mkdir -m 775 "/etc/namedb/keys"
 			chown named:named "/etc/namedb/keys"
 		fi
 		return 0;
 	fi
 	# If running in a chroot cage, ensure that the appropriate files
 	# exist inside the cage, as well as helper symlinks into the cage
 	# from outside.
+	#
 	# As this is called after the is_running and required_dir checks
 	# are made in run_rc_command(), we can safely assume ${named_chrootdir}
 	# exists and named isn't running at this point (unless forcestart
 	# is used).
+	#
 	case "$($command -v)" in
 	BIND*)	# 9 no group, named-xfer, or ndc
 		;;
 	named*)	# 4 and 8
 		rc_flags="-g named $rc_flags"
 		if [ ! -x "${named_chrootdir}/usr/libexec/named-xfer" -o \
 		    "${named_chrootdir}/usr/libexec/named-xfer" -ot \
 		    /usr/libexec/named-xfer ]; then
 			rm -f "${named_chrootdir}/usr/libexec/named-xfer"
 			cp -p /usr/libexec/named-xfer \
 			    "${named_chrootdir}/usr/libexec"
 		fi
 		ln -fs "${named_chrootdir}/var/run/ndc" /var/run/ndc
 		;;
 	esac
 	for i in null random urandom; do
 		if [ ! -c "${named_chrootdir}/dev/$i" ]; then
 			rm -f "${named_chrootdir}/dev/$i"
 			(cd /dev &&
 			    /bin/pax -rw -pe "$i" "${named_chrootdir}/dev")
 		fi
 	done
 	if [ ! -h /etc/namedb ]; then
 		named_migrate /etc/namedb ${named_chrootdir}
 	fi
 	for i in named.conf rndc.key; do
 		if [ \( -r "/etc/$i" \) -a \( ! -h "/etc/$i" \) -a \
 		     \( ! -r "${named_chrootdir}/etc/$i" \) ]; then
 			mv "/etc/$i" "${named_chrootdir}/etc/$i"
 			ln -s "${named_chrootdir}/etc/$i" "/etc/$i"

 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: network,v 1.79 2020/06/12 11:04:45 roy Exp $
+# $NetBSD: network,v 1.80 2020/07/04 06:24:53 skrll Exp $
+#
 # PROVIDE: network
 # REQUIRE: ipfilter ipsec mountcritlocal root tty sysctl
 # BEFORE:  NETWORKING
 $_rc_subr_loaded . /etc/rc.subr
 name="network"
 start_cmd="network_start"
 stop_cmd="network_stop"
 nl='
 @@ -181,27 +181,27 @@ network_start_ipv6_route()
 		if ! checkyesno ip6uniquelocal; then
 			/sbin/route -q add -inet6 fc00:: -prefixlen 7 \
 			    ::1 -reject
 		fi
 		;;
 	autohost)
 		if ! checkyesno dhcpcd; then
 			warn "rtsol and kernel ra handling have been removed"
 			warn "please configure dhcpcd in its place."
 		fi
 		;;
 	host)
 		echo 'IPv6 mode: host'
 		;;
 	*)	warn "invalid \$ip6mode value "\"$ip6mode\"
 		;;
 	esac
+}
 network_start_interfaces()
+{
 	# Configure all of the network interfaces listed in $net_interfaces;
 	# if $auto_ifconfig is YES, grab all interfaces from ifconfig.

 @@ -1,43 +1,43 @@
 #!/bin/sh
+#
-# $NetBSD: npf,v 1.4 2019/04/19 18:36:25 leot Exp $
+# $NetBSD: npf,v 1.5 2020/07/04 06:24:53 skrll Exp $
+#
 # Public Domain.
+#
 # PROVIDE: npf
 # REQUIRE: root bootconf mountcritlocal tty network
 # BEFORE: NETWORKING
 $_rc_subr_loaded . /etc/rc.subr
 name="npf"
 rcvar=$name
 config="/etc/npf.conf"
 start_cmd="npf_start"
 stop_cmd="npf_stop"
 reload_cmd="npf_reload"
 status_cmd="npf_status"
 extra_commands="reload status"
 npf_cfg_check()
+{
 	if [ ! -f ${config} ]; then
 		warn "${config} is not readable; failed."
 		exit 1
 	fi
+}
 npf_start()
+{
 	echo "Enabling NPF."
 	npf_cfg_check
 	/sbin/npfctl reload
 	# The npf_boot script has enabled npf already.
 	if [ "$autoboot" != "yes" ]; then
 		/sbin/npfctl start
 	fi

 @@ -1,41 +1,41 @@
 #!/bin/sh
+#
-# $NetBSD: ntpd,v 1.16 2015/11/23 19:56:47 christos Exp $
+# $NetBSD: ntpd,v 1.17 2020/07/04 06:24:53 skrll Exp $
+#
 # PROVIDE: ntpd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
 # KEYWORD: chrootdir
 $_rc_subr_loaded . /etc/rc.subr
 name="ntpd"
 rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 start_precmd="ntpd_precmd"
 required_files="/etc/ntp.conf"
 ntpd_precmd()
+{
 	rc_flags="-p ${pidfile} $rc_flags"
 	if [ -z "$ntpd_chrootdir" ]; then
 		return 0;
 	fi
 	# If running in a chroot cage, ensure that the appropriate files
 	# exist inside the cage, as well as helper symlinks into the cage
 	# from outside.
+	#
 	# As this is called after the is_running and required_dir checks
 	# are made in run_rc_command(), we can safely assume ${ntpd_chrootdir}
 	# exists and ntpd isn't running at this point (unless forcestart
 	# is used).
+	#
 	# Before enabling ntpd_chrootdir, ensure that:
 	#	- The kernel has "pseudo-device clockctl" compiled in
 	#	- /dev/clockctl is present
+	#
 	if (: </dev/clockctl) 2>/dev/null; then
 		: exists and works

 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: pf,v 1.11 2018/06/29 12:34:15 roy Exp $
+# $NetBSD: pf,v 1.12 2020/07/04 06:24:53 skrll Exp $
+#
 # PROVIDE: pf
 # REQUIRE: root bootconf mountcritlocal tty network dhcpcd
 # BEFORE: NETWORKING
 $_rc_subr_loaded . /etc/rc.subr
 name="pf"
 rcvar=$name
 start_precmd="pf_prestart"
 start_cmd="pf_start"
 stop_cmd="pf_stop"
 @@ -25,27 +25,27 @@ pf_prestart()
 		stop_boot
 		return 1
 	fi
 	return 0
+}
 pf_start()
+{
 	echo "Enabling pf firewall."
 	# The pf_boot script has enabled pf already.
 	if [ "$autoboot" != yes ]; then
 		/sbin/pfctl -q ${pf_flags} -e
 	fi
 	if [ -f ${pf_rules} ]; then
 		/sbin/pfctl -q ${pf_flags} -f ${pf_rules}
 	else
 		warn "${pf_rules} not found; no pf rules loaded."
 	fi
+}
 pf_stop()
+{
 	echo "Disabling pf firewall."
 	/sbin/pfctl -q ${pf_flags} -Fa -d

 @@ -1,38 +1,38 @@
 #!/bin/sh
+#
-# $NetBSD: rtadvd,v 1.10 2016/11/19 01:14:58 kre Exp $
+# $NetBSD: rtadvd,v 1.11 2020/07/04 06:24:53 skrll Exp $
+#
 # PROVIDE: rtadvd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
 $_rc_subr_loaded . /etc/rc.subr
 name=rtadvd
 rcvar=$name
 command="/usr/sbin/$name"
 pidfile="/var/run/$name.pid"
 extra_commands=reload
 start_precmd=rtadvd_prestart
 reload_precmd=rtadvd_prereload
 rtadvd_prereload()
+{
 	local chdir="$(getent passwd _rtadvd | cut -d: -f6)"
 	local conf=/etc/rtadvd.conf myflags o confdir
 	local cflag=false
 	[ -z "${chdir}" ] || [ "/${chdir}" = // ] && return 0
 	if [ -n "${flags}" ]; then
 		myflags=${flags}
 	else
 		eval myflags=\$${name}_flags
 	fi
 	set -- ${myflags}
 	while getopts c:dDfM:Rs o; do
 		# ignore other args, they are processed by rtadvd itself
 		case "${o}" in
 		c)	conf="${OPTARG}"
 			case "${conf}" in

 @@ -1,19 +1,19 @@
 #!/bin/sh
+#
-# $NetBSD: fccache.in,v 1.3 2012/02/07 10:36:01 mbalmer Exp $
+# $NetBSD: fccache.in,v 1.4 2020/07/04 06:24:53 skrll Exp $
+#
 # PROVIDE: fccache
 # REQUIRE: mountcritremote
 # BEFORE:  DAEMON
 $_rc_subr_loaded . /etc/rc.subr
 name="fccache"
 rcvar=${name}
 command="@X11ROOTDIR@/bin/fc-cache"
 start_cmd="fccache_start"
 stop_cmd=":"
 fccache_start()
+{