Module Name: src
Committed By: skrll
Date: Sat Jul 4 06:24:53 UTC 2020
Modified Files:
src/etc/rc.d: bootconf.sh fccache.in ipfilter lvm mdnsd named network
npf ntpd pf rtadvd
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/etc/rc.d/bootconf.sh
cvs rdiff -u -r1.3 -r1.4 src/etc/rc.d/fccache.in src/etc/rc.d/mdnsd
cvs rdiff -u -r1.18 -r1.19 src/etc/rc.d/ipfilter
cvs rdiff -u -r1.5 -r1.6 src/etc/rc.d/lvm
cvs rdiff -u -r1.25 -r1.26 src/etc/rc.d/named
cvs rdiff -u -r1.79 -r1.80 src/etc/rc.d/network
cvs rdiff -u -r1.4 -r1.5 src/etc/rc.d/npf
cvs rdiff -u -r1.16 -r1.17 src/etc/rc.d/ntpd
cvs rdiff -u -r1.11 -r1.12 src/etc/rc.d/pf
cvs rdiff -u -r1.10 -r1.11 src/etc/rc.d/rtadvd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/bootconf.sh
diff -u src/etc/rc.d/bootconf.sh:1.15 src/etc/rc.d/bootconf.sh:1.16
--- src/etc/rc.d/bootconf.sh:1.15 Mon Dec 31 23:21:27 2012
+++ src/etc/rc.d/bootconf.sh Sat Jul 4 06:24:53 2020
@@ -1,6 +1,6 @@
#!/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
@@ -38,7 +38,7 @@ bootconf_start()
case $name in
current|default|\*)
continue
- ;;
+ ;;
*)
if [ "$name" = "$default" ]; then
echo -n "${spc}[${name}]"
Index: src/etc/rc.d/fccache.in
diff -u src/etc/rc.d/fccache.in:1.3 src/etc/rc.d/fccache.in:1.4
--- src/etc/rc.d/fccache.in:1.3 Tue Feb 7 10:36:01 2012
+++ src/etc/rc.d/fccache.in Sat Jul 4 06:24:53 2020
@@ -1,9 +1,9 @@
#!/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
+# PROVIDE: fccache
# REQUIRE: mountcritremote
# BEFORE: DAEMON
Index: src/etc/rc.d/mdnsd
diff -u src/etc/rc.d/mdnsd:1.3 src/etc/rc.d/mdnsd:1.4
--- src/etc/rc.d/mdnsd:1.3 Thu Oct 15 16:47:28 2015
+++ src/etc/rc.d/mdnsd Sat Jul 4 06:24:53 2020
@@ -1,6 +1,6 @@
#!/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
@@ -22,6 +22,6 @@ mdnsd_precmd()
fi
chown _mdnsd:_mdnsd /var/run/mdnsd
}
-
+
load_rc_config $name
run_rc_command "$1"
Index: src/etc/rc.d/ipfilter
diff -u src/etc/rc.d/ipfilter:1.18 src/etc/rc.d/ipfilter:1.19
--- src/etc/rc.d/ipfilter:1.18 Mon Mar 23 18:52:02 2009
+++ src/etc/rc.d/ipfilter Sat Jul 4 06:24:53 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ipfilter,v 1.18 2009/03/23 18:52:02 hannken Exp $
+# $NetBSD: ipfilter,v 1.19 2020/07/04 06:24:53 skrll Exp $
#
# PROVIDE: ipfilter
@@ -84,7 +84,7 @@ ipfilter_reload()
if [ -f /etc/ipf6.conf ] && ! /sbin/ipf -I -6 -f /etc/ipf6.conf; then
err 1 "reload of ipf6.conf failed; not swapping to new ruleset."
fi
-
+
# Swap in the new rules
#
/sbin/ipf -s
Index: src/etc/rc.d/lvm
diff -u src/etc/rc.d/lvm:1.5 src/etc/rc.d/lvm:1.6
--- src/etc/rc.d/lvm:1.5 Tue Apr 21 16:08:57 2009
+++ src/etc/rc.d/lvm Sat Jul 4 06:24:53 2020
@@ -1,6 +1,6 @@
#!/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
@@ -20,7 +20,7 @@ lvm_start()
{
if [ -x /sbin/dmsetup ]; then
/sbin/dmsetup version >/dev/null
- if [ $? -ne 0 ]; then
+ if [ $? -ne 0 ]; then
warn "Device-mapper not present in kernel"
return 1;
fi
@@ -31,7 +31,7 @@ lvm_start()
# 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)
@@ -43,7 +43,7 @@ lvm_stop()
{
if [ -x /sbin/dmsetup ]; then
/sbin/dmsetup version >/dev/null
- if [ $? -ne 0 ]; then
+ if [ $? -ne 0 ]; then
warn "Device-mapper not present in kernel"
return 1;
fi
@@ -51,7 +51,7 @@ lvm_stop()
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 \
@@ -68,7 +68,7 @@ lvm_stop()
;;
esac
done
-
+
for vg in ${VOLUME_GROUPS}; do
# Set IFS to field separator
IFS=":"
@@ -76,7 +76,7 @@ lvm_stop()
# 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 \
Index: src/etc/rc.d/named
diff -u src/etc/rc.d/named:1.25 src/etc/rc.d/named:1.26
--- src/etc/rc.d/named:1.25 Sun Jul 13 22:06:56 2014
+++ src/etc/rc.d/named Sat Jul 4 06:24:53 2020
@@ -1,6 +1,6 @@
#!/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
@@ -77,7 +77,7 @@ named_precmd()
fi
# If running in a chroot cage, ensure that the appropriate files
- # exist inside the cage, as well as helper symlinks into the cage
+ # 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
@@ -104,7 +104,7 @@ named_precmd()
for i in null random urandom; do
if [ ! -c "${named_chrootdir}/dev/$i" ]; then
rm -f "${named_chrootdir}/dev/$i"
- (cd /dev &&
+ (cd /dev &&
/bin/pax -rw -pe "$i" "${named_chrootdir}/dev")
fi
done
Index: src/etc/rc.d/network
diff -u src/etc/rc.d/network:1.79 src/etc/rc.d/network:1.80
--- src/etc/rc.d/network:1.79 Fri Jun 12 11:04:45 2020
+++ src/etc/rc.d/network Sat Jul 4 06:24:53 2020
@@ -1,6 +1,6 @@
#!/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
@@ -191,7 +191,7 @@ network_start_ipv6_route()
fi
;;
- host)
+ host)
echo 'IPv6 mode: host'
;;
Index: src/etc/rc.d/npf
diff -u src/etc/rc.d/npf:1.4 src/etc/rc.d/npf:1.5
--- src/etc/rc.d/npf:1.4 Fri Apr 19 18:36:25 2019
+++ src/etc/rc.d/npf Sat Jul 4 06:24:53 2020
@@ -1,6 +1,6 @@
#!/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.
#
@@ -27,7 +27,7 @@ npf_cfg_check()
{
if [ ! -f ${config} ]; then
warn "${config} is not readable; failed."
- exit 1
+ exit 1
fi
}
Index: src/etc/rc.d/ntpd
diff -u src/etc/rc.d/ntpd:1.16 src/etc/rc.d/ntpd:1.17
--- src/etc/rc.d/ntpd:1.16 Mon Nov 23 19:56:47 2015
+++ src/etc/rc.d/ntpd Sat Jul 4 06:24:53 2020
@@ -1,6 +1,6 @@
#!/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
@@ -25,7 +25,7 @@ ntpd_precmd()
fi
# If running in a chroot cage, ensure that the appropriate files
- # exist inside the cage, as well as helper symlinks into the cage
+ # 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
Index: src/etc/rc.d/pf
diff -u src/etc/rc.d/pf:1.11 src/etc/rc.d/pf:1.12
--- src/etc/rc.d/pf:1.11 Fri Jun 29 12:34:15 2018
+++ src/etc/rc.d/pf Sat Jul 4 06:24:53 2020
@@ -1,6 +1,6 @@
#!/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
@@ -35,7 +35,7 @@ pf_start()
# The pf_boot script has enabled pf already.
if [ "$autoboot" != yes ]; then
- /sbin/pfctl -q ${pf_flags} -e
+ /sbin/pfctl -q ${pf_flags} -e
fi
if [ -f ${pf_rules} ]; then
Index: src/etc/rc.d/rtadvd
diff -u src/etc/rc.d/rtadvd:1.10 src/etc/rc.d/rtadvd:1.11
--- src/etc/rc.d/rtadvd:1.10 Sat Nov 19 01:14:58 2016
+++ src/etc/rc.d/rtadvd Sat Jul 4 06:24:53 2020
@@ -1,6 +1,6 @@
#!/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
@@ -22,7 +22,7 @@ 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
