 @@ -1,87 +1,87 @@
 #!/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()
+{
 		# Refer to newbtconf(8) for more information
+		#
 	if [ ! -e /etc/etc.current ]; then
 		return 0
 	fi
 	if [ -h /etc/etc.default ]; then
 		def=$(ls -ld /etc/etc.default 2>&1)
 		default="${def##*-> *etc.}"
 	else
 		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}
 	while [ ! -d /etc/etc.$conf/. ]; do
 		trap "conf=$default; echo; echo Using default of $default" ALRM
 		echo -n "Which configuration [$default] ? "
 		(sleep 30 && kill -ALRM $RC_PID) >/dev/null 2>&1 &
 		read conf
 		trap : ALRM
 		if [ -z $conf ] ; then
 			conf=$default
 		fi
 		if [ ! -d /etc/etc.$conf/. ]; then
 			conf=${_DUMMY}
 		fi
 	done
 	print_rc_metadata "note:Using configuration \"${conf}\""
 	case  $conf in
 	current|default)
 		;;
 	*)
 		rm -f /etc/etc.current
 		ln -s etc.$conf /etc/etc.current
 		sync
 		;;
 	esac
 	if [ -f /etc/rc.conf ] ; then
 		. /etc/rc.conf
 	fi
+}
 load_rc_config $name
 run_rc_command "$1"

 @@ -1,28 +1,28 @@
 #!/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()
+{
 	if [ -x "${command}" ]; then
 		echo -n "Updating fontconfig cache:"
 		${command}
 		echo " done."
 	fi
+}
 load_rc_config $name
 run_rc_command "$1"

 @@ -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,104 +1,104 @@		@@ -1,104 +1,104 @@
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"
17	reload_precmd="$stop_precmd"	17	reload_precmd="$stop_precmd"
18	reload_cmd="ipfilter_reload"	18	reload_cmd="ipfilter_reload"
19	resync_precmd="$stop_precmd"	19	resync_precmd="$stop_precmd"
20	resync_cmd="ipfilter_resync"	20	resync_cmd="ipfilter_resync"
21	status_precmd="$stop_precmd"	21	status_precmd="$stop_precmd"
22	status_cmd="ipfilter_status"	22	status_cmd="ipfilter_status"
23	extra_commands="reload resync status"	23	extra_commands="reload resync status"
24		24
25	ipfilter_prestart()	25	ipfilter_prestart()
26	{	26	{
27	if [ ! -f /etc/ipf.conf ] && [ ! -f /etc/ipf6.conf ]; then	27	if [ ! -f /etc/ipf.conf ] && [ ! -f /etc/ipf6.conf ]; then
28	warn "/etc/ipf*.conf not readable; ipfilter start aborted."	28	warn "/etc/ipf*.conf not readable; ipfilter start aborted."
29		29
30	stop_boot	30	stop_boot
31	return 1	31	return 1
32	fi	32	fi
33	return 0	33	return 0
34	}	34	}
35		35
36	ipfilter_start()	36	ipfilter_start()
37	{	37	{
38	echo "Enabling ipfilter."	38	echo "Enabling ipfilter."
39	/sbin/ipf ${rc_flags} -E	39	/sbin/ipf ${rc_flags} -E
40		40
41	# Do the flush first; since older ipf has different semantics.	41	# Do the flush first; since older ipf has different semantics.
42	#	42	#
43	if [ -f /etc/ipf.conf ]; then	43	if [ -f /etc/ipf.conf ]; then
44	/sbin/ipf -Fa	44	/sbin/ipf -Fa
45	fi	45	fi
46	if [ -f /etc/ipf6.conf ]; then	46	if [ -f /etc/ipf6.conf ]; then
47	/sbin/ipf -6 -Fa	47	/sbin/ipf -6 -Fa
48	fi	48	fi
49		49
50	# Now load the config files	50	# Now load the config files
51	#	51	#
52	if [ -f /etc/ipf.conf ]; then	52	if [ -f /etc/ipf.conf ]; then
53	/sbin/ipf -f /etc/ipf.conf	53	/sbin/ipf -f /etc/ipf.conf
54	fi	54	fi
55	if [ -f /etc/ipf6.conf ]; then	55	if [ -f /etc/ipf6.conf ]; then
56	/sbin/ipf -6 -f /etc/ipf6.conf	56	/sbin/ipf -6 -f /etc/ipf6.conf
57	fi	57	fi
58	}	58	}
59		59
60	ipfilter_stop()	60	ipfilter_stop()
61	{	61	{
62	echo "Disabling ipfilter."	62	echo "Disabling ipfilter."
63	/sbin/ipf -D	63	/sbin/ipf -D
64	}	64	}
65		65
66	ipfilter_reload()	66	ipfilter_reload()
67	{	67	{
68	echo "Reloading ipfilter rules."	68	echo "Reloading ipfilter rules."
69		69
70	# Do the flush first; since older ipf has different semantics.	70	# Do the flush first; since older ipf has different semantics.
71	#	71	#
72	if [ -f /etc/ipf.conf ]; then	72	if [ -f /etc/ipf.conf ]; then
73	/sbin/ipf -I -Fa	73	/sbin/ipf -I -Fa
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
101	}	101	}
102		102
103	load_rc_config $name	103	load_rc_config $name
104	run_rc_command "$1"	104	run_rc_command "$1"

 @@ -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,146 +1,146 @@
 #!/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"
 start_precmd="named_precmd"
 extra_commands="reload"
 required_dirs="$named_chrootdir"	# if it is set, it must exist
 named_migrate()
+{
 	local src="$1"
 	local dst="$2$1"
 	echo "Migrating $src to $dst"
+(
 	diff=false
 	cd "$src"
 	mkdir -p "$dst"
 	for f in $(find . -type f)
 	do
 		f="${f##./}"
 		case "$f" in
 		*/*)
 			ds="$(dirname "$f")"
 			dd="$dst/$ds"
 			mkdir -p "$dd"
 			chmod "$(stat -f "%p" "$ds" |
 			    sed -e 's/.*\([0-7][0-7][0-7][0-7]\)$/\1/g')" "$dd"
 			chown "$(stat -f %u:%g "$ds")" "$dd"
 			;;
 		*)
 			;;
 		esac
 		if [ -r "$dst/$f" ]
 		then
 			if ! cmp "$f" "$dst/$f"; then
 				diff=true
 			fi
 		else
 			cp -p "$f" "$dst/$f"
 		fi
 	done
 	if $diff; then
 		echo "Cannot complete migration because files are different"
 		echo "Run 'diff -r $src $dst' resolve the differences"
 	else
 		rm -fr "$src"
 		ln -s "$dst" "$src"
 	fi
+)
+}
 named_precmd()
+{
 	if [ ! -e "/etc/rndc.key" ]; then
 		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"
 		fi
 	done
 	if [ \( ! -r ${named_chrootdir}/etc/named.conf \) -a \
 	    \( -r ${named_chrootdir}/etc/namedb/named.conf \) ]; then
 		ln -s namedb/named.conf ${named_chrootdir}/etc
 	fi
 	if [ -f /etc/localtime ]; then
 		cmp -s /etc/localtime "${named_chrootdir}/etc/localtime" || \
 		    cp -p /etc/localtime "${named_chrootdir}/etc/localtime"
 	fi
 	local piddir="$(dirname "${pidfile}")"
 	mkdir -p "${named_chrootdir}${piddir}" "${piddir}"
 	chmod 755 "${named_chrootdir}${piddir}" "${piddir}"
 	chown named:named "${named_chrootdir}${piddir}" "${piddir}"
 	ln -fs "${named_chrootdir}${pidfile}" "${pidfile}"
 	#	Change run_rc_commands()'s internal copy of $named_flags
+	#
 	rc_flags="-u named -t ${named_chrootdir} $rc_flags"
+}
 load_rc_config $name
 run_rc_command "$1"

 @@ -1,570 +1,570 @@
 #!/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='
 ' # a newline
 intmissing()
+{
 	local int="$1"
 	shift
 	for i; do
 		if [ "$int" = "$i" ]; then
 			return 1
 		fi
 	done
 	return 0
+}
 have_inet6()
+{
 	/sbin/ifconfig lo0 inet6 >/dev/null 2>&1
+}
 network_start()
+{
 	# set hostname, turn on network
+	#
 	echo "Starting network."
 	network_start_hostname
 	network_start_domainname
 	network_start_loopback
 	have_inet6 &&
 	network_start_ipv6_route
 	[ "$net_interfaces" != NO ] &&
 	network_start_interfaces
 	network_start_aliases
 	network_start_defaultroute
 	network_start_defaultroute6
 	have_inet6 &&
 	network_wait_dad
 	network_start_resolv
 	network_start_local
+}
 network_start_hostname()
+{
 	# If $hostname is set, use it for my Internet name,
 	# otherwise use /etc/myname
+	#
 	if [ -z "$hostname" ] && [ -f /etc/myname ]; then
 		hostname=$(kat /etc/myname)
 	fi
 	if [ -n "$hostname" ]; then
 		echo "Hostname: $hostname"
 		hostname $hostname
 	else
 		# Don't warn about it if we're going to run
 		# DHCP later, as we will probably get the
 		# hostname at that time.
+		#
 		if ! checkyesno dhcpcd && \
 			[ -z "$(hostname)" ]
 		then
 			warn "\$hostname not set."
 		fi
 	fi
+}
 network_start_domainname()
+{
 	# Check $domainname first, then /etc/defaultdomain,
 	# for NIS/YP domain name
+	#
 	if [ -z "$domainname" ] && [ -f /etc/defaultdomain ]; then
 		domainname=$(kat /etc/defaultdomain)
 	fi
 	if [ -n "$domainname" ]; then
 		echo "NIS domainname: $domainname"
 		domainname $domainname
 	fi
 	# Flush all routes just to make sure it is clean
 	if checkyesno flushroutes; then
 		/sbin/route -qn flush
 	fi
+}
 network_start_loopback()
+{
 	# Set the address for the first loopback interface, so that the
 	# auto-route from a newly configured interface's address to lo0
 	# works correctly.
+	#
 	# NOTE: obscure networking problems will occur if lo0 isn't configured.
+	#
 	/sbin/ifconfig lo0 inet 127.0.0.1
 	# According to RFC1122, 127.0.0.0/8 must not leave the node.
+	#
 	/sbin/route -q add -inet 127.0.0.0 -netmask 0xff000000 127.0.0.1 -reject
+}
 network_start_ipv6_route()
+{
 	# IPv6 routing setups, and host/router mode selection.
+	#
 	# We have IPv6 support in kernel.
 	# disallow link-local unicast dest without outgoing scope
 	# identifiers.
+	#
 	/sbin/route -q add -inet6 fe80:: -prefixlen 10 ::1 -reject
 	# disallow the use of the RFC3849 documentation address
+	#
 	/sbin/route -q add -inet6 2001:db8:: -prefixlen 32 ::1 -reject
 	# IPv6 site-local scoped address prefix (fec0::/10)
 	# has been deprecated by RFC3879.
+	#
 	if [ -n "$ip6sitelocal" ]; then
 		warn "\$ip6sitelocal is no longer valid"
 	fi
 	# disallow "internal" addresses to appear on the wire.
+	#
 	/sbin/route -q add -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
 	# disallow packets to malicious IPv4 compatible prefix
+	#
 	/sbin/route -q add -inet6 ::224.0.0.0 -prefixlen 100 ::1 -reject
 	/sbin/route -q add -inet6 ::127.0.0.0 -prefixlen 104 ::1 -reject
 	/sbin/route -q add -inet6 ::0.0.0.0 -prefixlen 104 ::1 -reject
 	/sbin/route -q add -inet6 ::255.0.0.0 -prefixlen 104 ::1 -reject
 	# disallow packets to malicious 6to4 prefix
+	#
 	/sbin/route -q add -inet6 2002:e000:: -prefixlen 20 ::1 -reject
 	/sbin/route -q add -inet6 2002:7f00:: -prefixlen 24 ::1 -reject
 	/sbin/route -q add -inet6 2002:0000:: -prefixlen 24 ::1 -reject
 	/sbin/route -q add -inet6 2002:ff00:: -prefixlen 24 ::1 -reject
 	# Completely disallow packets to IPv4 compatible prefix.
 	# This may conflict with RFC1933 under following circumstances:
 	# (1) An IPv6-only KAME node tries to originate packets to IPv4
 	#     compatible destination.  The KAME node has no IPv4
 	#     compatible support.  Under RFC1933, it should transmit
 	#     native IPv6 packets toward IPv4 compatible destination,
 	#     hoping it would reach a router that forwards the packet
 	#     toward auto-tunnel interface.
 	# (2) An IPv6-only node originates a packet to IPv4 compatible
 	#     destination.  A KAME node is acting as an IPv6 router, and
 	#     asked to forward it.
 	# Due to rare use of IPv4 compatible address, and security
 	# issues with it, we disable it by default.
+	#
 	/sbin/route -q add -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
 	/sbin/sysctl -qw net.inet6.ip6.forwarding=0
 	case $ip6mode in
 	router)
 		echo 'IPv6 mode: router'
 		/sbin/sysctl -qw net.inet6.ip6.forwarding=1
 		# disallow unique-local unicast forwarding without
 		# explicit configuration.
 		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.
 	# In the following, "xxN" stands in for interface names, like "le0".
+	#
 	# For any interfaces that has an $ifconfig_xxN variable
 	# associated, we break it into lines using ';' as a separator,
 	# then process it just like the contents of an /etc/ifconfig.xxN
 	# file.
+	#
 	# For each line from the $ifconfig_xxN variable or the
 	# /etc/ifconfig.xxN file, we ignore comments and blank lines,
 	# treat lines beginning with "!" as commands to execute, treat
 	# "dhcp" as a special case to invoke dhcpcd, treat "rtsol" as
 	# a special case to send a router solicitation, and for any other
 	# line we run "ifconfig xxN", using each line of the file as the
 	# arguments for a separate "ifconfig" invocation.
+	#
 	# In order to configure an interface reasonably, you at the very least
 	# need to specify "[addr_family] [hostname]" (e.g "inet my.domain.org"),
 	# and probably a netmask (as in "netmask 0xffffffe0"). You will
 	# frequently need to specify a media type, as in "media UTP", for
 	# interface cards with multiple media connections that do not
 	# autoconfigure. See the ifconfig manual page for details.
+	#
 	# Note that /etc/ifconfig.xxN takes multiple lines.  The following
 	# configuration is possible:
 	#	inet 10.1.1.1 netmask 0xffffff00
 	#	inet 10.1.1.2 netmask 0xffffff00 alias
 	#	inet6 2001:db8::1 prefixlen 64 alias
+	#
 	# You can put shell script fragment into /etc/ifconfig.xxN by
 	# starting a line with "!".  Refer to ifconfig.if(5) for details.
+	#
 	ifaces="$(/sbin/ifconfig -l)"
 	if checkyesno auto_ifconfig; then
 		tmp="$ifaces"
 		for cloner in $(/sbin/ifconfig -C); do
 			for int in /etc/ifconfig.${cloner}[0-9]*; do
 				[ ! -f $int ] && break
 				tmp="$tmp ${int##*.}"
 			done
 		done
 	else
 		tmp="$net_interfaces"
 	fi
 	echo -n 'Configuring network interfaces:'
 	for int in $tmp; do
 		eval argslist=\$ifconfig_$int
 		# Skip interfaces that do not have explicit
 		# configuration information.  If auto_ifconfig is
 		# false then also warn about such interfaces.
+		#
 		if [ -z "$argslist" ] && ! [ -f /etc/ifconfig.$int ]
 		then
 			if ! checkyesno auto_ifconfig; then
 				echo
 				warn \
 		"/etc/ifconfig.$int missing and ifconfig_$int not set;"
 				warn "interface $int not configured."
 			fi
 			continue
 		fi
 		echo -n " $int"
 		# Create the interface if necessary.
 		# If the interface did not exist before,
 		# then also resync ipf(4).
+		#
 		if intmissing $int $ifaces; then
 			if /sbin/ifconfig $int create && \
 			   checkyesno ipfilter; then
 				/sbin/ipf -y >/dev/null
 			fi
 		fi
 		# If $ifconfig_xxN is empty, then use
 		# /etc/ifconfig.xxN, which we know exists due to
 		# an earlier test.
+		#
 		# If $ifconfig_xxN is non-empty and contains a
 		# newline, then just use it as is.  (This allows
 		# semicolons through unmolested.)
+		#
 		# If $ifconfig_xxN is non-empty and does not
 		# contain a newline, then convert all semicolons
 		# to newlines.
+		#
 		case "$argslist" in
 		'')
 			cat /etc/ifconfig.$int
 			;;
 		*"${nl}"*)
 			echo "$argslist"
 			;;
 		*)
+			(
 				set -o noglob
 				IFS=';'; set -- $argslist
 				#echo >&2 "[$#] [$1] [$2] [$3] [$4]"
 				IFS="$nl"; echo "$*"
+			)
 			;;
 		esac |
 		collapse_backslash_newline |
 		while read -r args; do
 			case "$args" in
 			''|"#"*|create)
 				;;
 			"!"*)
 				# Run arbitrary command in a subshell.
 				( eval "${args#*!}" )
 				;;
 			dhcp)
 				if ! checkyesno dhcpcd; then
 					/sbin/dhcpcd -n --dhcp \
 						${dhcpcd_flags} $int
 				fi
 				;;
 			rtsol)
 				if ! checkyesno dhcpcd; then
 					/sbin/dhcpcd -n --ipv6rs \
 						${dhcpcd_flags} $int
 				fi
 				;;
 			*)
 				# Pass args to ifconfig.  Note
 				# that args may contain embedded
 				# shell metacharacters, such as
 				# "ssid 'foo;*>bar'". We eval
 				# one more time so that things
 				# like ssid "Columbia University" work.
+				(
 					set -o noglob
 					eval set -- $args
 					#echo >&2 "[$#] [$1] [$2] [$3]"
 					/sbin/ifconfig $int "$@"
+				)
 				;;
 			esac
 		done
 		configured_interfaces="$configured_interfaces $int"
 	done
 	echo "."
+}
 network_start_aliases()
+{
 	echo -n "Adding interface aliases:"
 	# Check if each configured interface xxN has an $ifaliases_xxN variable
 	# associated, then configure additional IP addresses for that interface.
 	# The variable contains a list of "address netmask" pairs, with
 	# "netmask" set to "-" if the interface default netmask is to be used.
+	#
 	# Note that $ifaliases_xxN works only in certain cases and its
 	# use is not recommended.  Use /etc/ifconfig.xxN or multiple
 	# commands in $ifconfig_xxN instead.
+	#
 	for int in lo0 $configured_interfaces; do
 		eval args=\$ifaliases_$int
 		if [ -n "$args" ]; then
 			set -- $args
 			while [ $# -ge 2 ]; do
 				addr=$1 ; net=$2 ; shift 2
 				if [ "$net" = "-" ]; then
 					# for compatibility only, obsolete
 					/sbin/ifconfig $int inet alias $addr
 				else
 					/sbin/ifconfig $int inet alias $addr \
 					    netmask $net
 				fi
 				echo -n " $int:$addr"
 			done
 		fi
 	done
 	# /etc/ifaliases, if it exists, contains the names of additional IP
 	# addresses for each interface. It is formatted as a series of lines
 	# that contain
 	#	address interface netmask
+	#
 	# Note that /etc/ifaliases works only in certain cases and its
 	# use is not recommended.  Use /etc/ifconfig.xxN or multiple
 	# commands in $ifconfig_xxN instead.
+	#
 	if [ -f /etc/ifaliases ]; then
 		while read addr int net; do
 			if [ -z "$net" ]; then
 				# for compatibility only, obsolete
 				/sbin/ifconfig $int inet alias $addr
 			else
 				/sbin/ifconfig $int inet alias $addr netmask $net
 			fi
 		done < /etc/ifaliases
 	fi
 	echo "." # for "Adding interface aliases:"
+}
 network_start_defaultroute()
+{
 	# Check $defaultroute, then /etc/mygate, for the name or address
 	# of my IPv4 gateway host. If using a name, that name must be in
 	# /etc/hosts.
+	#
 	if [ -z "$defaultroute" ] && [ -f /etc/mygate ]; then
 		defaultroute=$(kat /etc/mygate)
 	fi
 	if [ -n "$defaultroute" ]; then
 		/sbin/route add default $defaultroute
 	fi
+}
 network_start_defaultroute6()
+{
 	# Check $defaultroute6, then /etc/mygate6, for the name or address
 	# of my IPv6 gateway host. If using a name, that name must be in
 	# /etc/hosts.  Note that the gateway host address must be a link-local
 	# address if it is not using an stf* interface.
+	#
 	if [ -z "$defaultroute6" ] && [ -f /etc/mygate6 ]; then
 		defaultroute6=$(kat /etc/mygate6)
 	fi
 	if [ -n "$defaultroute6" ]; then
 		if [ "$ip6mode" = "autohost" ]; then
 			echo
 			warn \
 	    "ip6mode is set to 'autohost' and a v6 default route is also set."
 		fi
 		/sbin/route add -inet6 default $defaultroute6
 	fi
+}
 network_wait_dad()
+{
 	# Wait for the DAD flags to clear from all addresses.
 	if [ -n "$ifconfig_wait_dad_flags" ]; then
 		echo "Waiting for duplicate address detection to finish..."
 		ifconfig $ifconfig_wait_dad_flags
 	fi
+}
 network_start_resolv()
+{
 	resconf=
 	if [ -n "$dns_domain" ]; then
 		resconf="${resconf}domain $dns_domain$nl"
 	fi
 	if [ -n "$dns_search" ]; then
 		resconf="${resconf}search $dns_search$nl"
 	fi
 	for n in $dns_nameservers; do
 		resconf="${resconf}nameserver $n$nl"
 	done
 	if [ -n "$dns_sortlist" ]; then
 		resconf="${resconf}sortlist $dns_sortlist$nl"
 	fi
 	if [ -n "$dns_options" ]; then
 		resconf="${resconf}options $dns_options$nl"
 	fi
 	if [ -n "$resconf" ]; then
 		resconf="# Generated by /etc/rc.d/network$nl$resconf"
 		echo 'Configuring resolv.conf'
 		printf %s "$resconf" | resolvconf -m "${dns_metric:-0}" -a network
 	fi
+}
 network_start_local()
+{
 	# XXX this must die
 	if [ -s /etc/netstart.local ]; then
 		sh /etc/netstart.local start
 	fi
+}
 network_stop()
+{
 	echo "Stopping network."
 	network_stop_local
 	network_stop_resolv
 	network_stop_aliases
 	[ "$net_interfaces" != NO ] &&
 	network_stop_interfaces
 	network_stop_route
+}
 network_stop_local()
+{
 	# XXX this must die
 	if [ -s /etc/netstart.local ]; then
 		sh /etc/netstart.local stop
 	fi
+}
 network_stop_resolv()
+{
 	resolvconf -f -d network
+}
 network_stop_aliases()
+{
 	echo "Deleting aliases."
 	if [ -f /etc/ifaliases ]; then
 		while read addr int net; do
 			/sbin/ifconfig $int inet delete $addr
 		done < /etc/ifaliases
 	fi
 	for int in $(/sbin/ifconfig -lu); do
 		eval args=\$ifaliases_$int
 		if [ -n "$args" ]; then
 			set -- $args
 			while [ $# -ge 2 ]; do
 				addr=$1 ; net=$2 ; shift 2
 				/sbin/ifconfig $int inet delete $addr
 			done
 		fi
 	done
+}
 network_stop_interfaces()
+{
 	# down interfaces
+	#
 	echo -n 'Downing network interfaces:'
 	if checkyesno auto_ifconfig; then
 		tmp=$(/sbin/ifconfig -l)
 	else
 		tmp="$net_interfaces"
 	fi
 	for int in $tmp; do
 		eval args=\$ifconfig_$int
 		if [ -n "$args" ] || [ -f /etc/ifconfig.$int ]; then
 			echo -n " $int"
 			if [ -f /var/run/dhcpcd-$int.pid ]; then
 				/sbin/dhcpcd -k $int 2> /dev/null
 			fi
 			/sbin/ifconfig $int down
 			if /sbin/ifconfig $int destroy 2>/dev/null && \
 			   checkyesno ipfilter; then
 				# resync ipf(4)
 				/sbin/ipf -y >/dev/null
 			fi
 		fi
 	done
 	echo "."
+}
 network_stop_route()
+{
 	# flush routes
+	#
 	if checkyesno flushroutes; then
 		/sbin/route -qn flush
 	fi
+}
 load_rc_config $name
 load_rc_config_var dhcpcd dhcpcd
 load_rc_config_var ipfilter ipfilter
 run_rc_command "$1"

	@@ -1,66 +1,66 @@		@@ -1,66 +1,66 @@
1	#!/bin/sh	1	#!/bin/sh
2	#	2	#
3	# $NetBSD: npf,v 1.4 2019/04/19 18:36:25 leot Exp $	3	# $NetBSD: npf,v 1.5 2020/07/04 06:24:53 skrll Exp $
4	#	4	#
5	# Public Domain.	5	# Public Domain.
6	#	6	#
7		7
8	# PROVIDE: npf	8	# PROVIDE: npf
9	# REQUIRE: root bootconf mountcritlocal tty network	9	# REQUIRE: root bootconf mountcritlocal tty network
10	# BEFORE: NETWORKING	10	# BEFORE: NETWORKING
11		11
12	$_rc_subr_loaded . /etc/rc.subr	12	$_rc_subr_loaded . /etc/rc.subr
13		13
14	name="npf"	14	name="npf"
15	rcvar=$name	15	rcvar=$name
16		16
17	config="/etc/npf.conf"	17	config="/etc/npf.conf"
18		18
19	start_cmd="npf_start"	19	start_cmd="npf_start"
20	stop_cmd="npf_stop"	20	stop_cmd="npf_stop"
21		21
22	reload_cmd="npf_reload"	22	reload_cmd="npf_reload"
23	status_cmd="npf_status"	23	status_cmd="npf_status"
24	extra_commands="reload status"	24	extra_commands="reload status"
25		25
26	npf_cfg_check()	26	npf_cfg_check()
27	{	27	{
28	if [ ! -f ${config} ]; then	28	if [ ! -f ${config} ]; then
29	warn "${config} is not readable; failed."	29	warn "${config} is not readable; failed."
30	exit 1	30	exit 1
31	fi	31	fi
32	}	32	}
33		33
34	npf_start()	34	npf_start()
35	{	35	{
36	echo "Enabling NPF."	36	echo "Enabling NPF."
37	npf_cfg_check	37	npf_cfg_check
38	/sbin/npfctl reload	38	/sbin/npfctl reload
39		39
40	# The npf_boot script has enabled npf already.	40	# The npf_boot script has enabled npf already.
41	if [ "$autoboot" != "yes" ]; then	41	if [ "$autoboot" != "yes" ]; then
42	/sbin/npfctl start	42	/sbin/npfctl start
43	fi	43	fi
44	}	44	}
45		45
46	npf_stop()	46	npf_stop()
47	{	47	{
48	echo "Disabling NPF."	48	echo "Disabling NPF."
49	/sbin/npfctl stop	49	/sbin/npfctl stop
50	/sbin/npfctl flush	50	/sbin/npfctl flush
51	}	51	}
52		52
53	npf_reload()	53	npf_reload()
54	{	54	{
55	echo "Reloading NPF ruleset."	55	echo "Reloading NPF ruleset."
56	npf_cfg_check	56	npf_cfg_check
57	/sbin/npfctl reload	57	/sbin/npfctl reload
58	}	58	}
59		59
60	npf_status()	60	npf_status()
61	{	61	{
62	:	62	:
63	}	63	}
64		64
65	load_rc_config $name	65	load_rc_config $name
66	run_rc_command "$1"	66	run_rc_command "$1"

 @@ -1,81 +1,81 @@
 #!/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
 	else
 		logger -s -p daemon.warning -t ntpd \
 		    "WARNING: not chrooting -- no working /dev/clockctl device"
 		return 0
 	fi
 	if [ ! -c "${ntpd_chrootdir}/dev/clockctl" ]; then
 		rm -f "${ntpd_chrootdir}/dev/clockctl"
 		( cd /dev ; /bin/pax -rw -pe clockctl "${ntpd_chrootdir}/dev" )
 	fi
 	ln -fs "${ntpd_chrootdir}/var/db/ntp.drift" /var/db/ntp.drift
 	if [ ! -d "${ntpd_chrootdir}/etc" ]; then
 		mkdir "${ntpd_chrootdir}/etc"
 	fi
 	for f in resolv.conf; do
 		if ! cmp -s "/etc/$f" "${ntpd_chrootdir}/etc/$f"; then
 			cp -p "/etc/$f" "${ntpd_chrootdir}/etc/$f"
 		fi
 	done
 	if [ ! -f "${ntpd_chrootdir}/etc/services" ]; then
 		getent services ntp/udp ntp/tcp \
 			> "${ntpd_chrootdir}/etc/services"
 	fi
 	if [ ! -d "${ntpd_chrootdir}/var/db" ]; then
 		mkdir -p "${ntpd_chrootdir}/var/db"
 	fi
 	if [ ! -f "${ntpd_chrootdir}/var/db/services.cdb" ]; then
 		services_mkdb -o "${ntpd_chrootdir}/var/db/services.cdb" \
 			"${ntpd_chrootdir}/etc/services"
 	fi
 	#	Change run_rc_commands()'s internal copy of $ntpd_flags
+	#
 	rc_flags="-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags"
+}
 load_rc_config $name
 run_rc_command "$1"

	@@ -1,70 +1,70 @@		@@ -1,70 +1,70 @@
1	#!/bin/sh	1	#!/bin/sh
2	#	2	#
3	# $NetBSD: pf,v 1.11 2018/06/29 12:34:15 roy Exp $	3	# $NetBSD: pf,v 1.12 2020/07/04 06:24:53 skrll Exp $
4	#	4	#
5		5
6	# PROVIDE: pf	6	# PROVIDE: pf
7	# REQUIRE: root bootconf mountcritlocal tty network dhcpcd	7	# REQUIRE: root bootconf mountcritlocal tty network dhcpcd
8	# BEFORE: NETWORKING	8	# BEFORE: NETWORKING
9		9
10	$_rc_subr_loaded . /etc/rc.subr	10	$_rc_subr_loaded . /etc/rc.subr
11		11
12	name="pf"	12	name="pf"
13	rcvar=$name	13	rcvar=$name
14	start_precmd="pf_prestart"	14	start_precmd="pf_prestart"
15	start_cmd="pf_start"	15	start_cmd="pf_start"
16	stop_cmd="pf_stop"	16	stop_cmd="pf_stop"
17	reload_cmd="pf_reload"	17	reload_cmd="pf_reload"
18	status_cmd="pf_status"	18	status_cmd="pf_status"
19	extra_commands="reload status"	19	extra_commands="reload status"
20		20
21	pf_prestart()	21	pf_prestart()
22	{	22	{
23	if [ ! -f ${pf_rules} ]; then	23	if [ ! -f ${pf_rules} ]; then
24	warn "${pf_rules} not readable; pf start aborted."	24	warn "${pf_rules} not readable; pf start aborted."
25		25
26	stop_boot	26	stop_boot
27	return 1	27	return 1
28	fi	28	fi
29	return 0	29	return 0
30	}	30	}
31		31
32	pf_start()	32	pf_start()
33	{	33	{
34	echo "Enabling pf firewall."	34	echo "Enabling pf firewall."
35		35
36	# The pf_boot script has enabled pf already.	36	# The pf_boot script has enabled pf already.
37	if [ "$autoboot" != yes ]; then	37	if [ "$autoboot" != yes ]; then
38	/sbin/pfctl -q ${pf_flags} -e	38	/sbin/pfctl -q ${pf_flags} -e
39	fi	39	fi
40		40
41	if [ -f ${pf_rules} ]; then	41	if [ -f ${pf_rules} ]; then
42	/sbin/pfctl -q ${pf_flags} -f ${pf_rules}	42	/sbin/pfctl -q ${pf_flags} -f ${pf_rules}
43	else	43	else
44	warn "${pf_rules} not found; no pf rules loaded."	44	warn "${pf_rules} not found; no pf rules loaded."
45	fi	45	fi
46	}	46	}
47		47
48	pf_stop()	48	pf_stop()
49	{	49	{
50	echo "Disabling pf firewall."	50	echo "Disabling pf firewall."
51	/sbin/pfctl -q ${pf_flags} -Fa -d	51	/sbin/pfctl -q ${pf_flags} -Fa -d
52	}	52	}
53		53
54	pf_reload()	54	pf_reload()
55	{	55	{
56	echo "Reloading pf rules."	56	echo "Reloading pf rules."
57	if [ -f ${pf_rules} ]; then	57	if [ -f ${pf_rules} ]; then
58	/sbin/pfctl -q ${pf_flags} -f ${pf_rules}	58	/sbin/pfctl -q ${pf_flags} -f ${pf_rules}
59	else	59	else
60	warn "${pf_rules} not found; no pf rules loaded."	60	warn "${pf_rules} not found; no pf rules loaded."
61	fi	61	fi
62	}	62	}
63		63
64	pf_status()	64	pf_status()
65	{	65	{
66	/sbin/pfctl ${pf_flags} -s info	66	/sbin/pfctl ${pf_flags} -s info
67	}	67	}
68		68
69	load_rc_config $name	69	load_rc_config $name
70	run_rc_command "$1"	70	run_rc_command "$1"

 @@ -1,79 +1,79 @@
 #!/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
 			/*)	;;
 			*)	echo "${name}: config file (${conf}) must be" \
 					"full pathname"
 				return 1
 				;;
 			esac
 			cflag=true;;
 		esac
 	done
 	${cflag} || test -f "${conf}" && {
 		confdir=$(dirname "${conf}")
 		echo "${name}: copying ${conf} to ${chdir}${conf}"
 		mkdir -p "${chdir}${confdir}"
 		cp "${conf}" "${chdir}${conf}" || return 1
+	}
 	# Make sure /var/run exists in the chroot
 	mkdir -p "${chdir}/var/run"
 	# Provide a link to the chrooted dump file
 	ln -snf "${chdir}/var/run/${name}.dump" /var/run
 	# Note: actual chroot is done by rtadvd itself
 	return 0
+}
 rtadvd_prestart()
+{
 	if [ "$ip6mode" != router ]; then
 		warn \
 	"${name} cannot be used on IPv6 host, only on an IPv6 router."
 		return 1
 	fi
 	rtadvd_prereload
+}
 load_rc_config $name
 run_rc_command "$1"