CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Wed Jun 21 16:06:14 UTC 2023 Modified Files: src/etc/rc.d [netbsd-9]: sshd Log Message: Pull up following revision(s) (requested by kim in ticket #1643): etc/rc.d/sshd: revision 1.30 etc/rc.d/sshd: revision 1.33 etc/rc.d/sshd: revision 1.34 etc/rc.d/sshd: revision 1.35 simplify more (from rudolf) /etc/rc.d/sshd: New check cmd and reload precmd. - check cmd: run `sshd -t' to check sshd_config file - reload precmd: run check cmd before reloading so we don't nuke sshd if there's an error in the sshd_config file (It is still possible to effectively nuke sshd by changing the configuration tosomething that won't work on your network, but at least we avoid making sshd just exit on reload when you make a typo in a config option.) /etc/rc.d/sshd: Stop generating DSA host keys by default. If you want them you can generate them yourself, but in this day and age (Monday and 2023, specifically) there's no reason to be using DSA except for compatibility with ancient legacy software. /etc/rc.d/sshd: Use default curve for ECDSA keygen, not NIST P-521. The default is NIST P-256, which: (a) has plenty of cryptanalytic security, (b) performs better on essentially all platforms (smaller enough that even the advantage of the Mersenne prime structure of P-521 can't compete), and (c) likely gets more scrutiny on implementations than P-521 since it's more widespread. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.29.4.1 src/etc/rc.d/sshd 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/sshd diff -u src/etc/rc.d/sshd:1.29 src/etc/rc.d/sshd:1.29.4.1 --- src/etc/rc.d/sshd:1.29 Sat May 26 19:18:11 2018 +++ src/etc/rc.d/sshd Wed Jun 21 16:06:14 2023 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: sshd,v 1.29 2018/05/26 19:18:11 riastradh Exp $ +# $NetBSD: sshd,v 1.29.4.1 2023/06/21 16:06:14 martin Exp $ # # PROVIDE: sshd @@ -13,14 +13,14 @@ rcvar=$name command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/ssh/sshd_config" -extra_commands="keygen reload" +extra_commands="check keygen reload" sshd_keygen() { ( keygen="/usr/bin/ssh-keygen" umask 022 - while read type bits filename version name; do + while read type bits filename; do f="/etc/ssh/$filename" if [ -f "$f" ]; then continue @@ -33,10 +33,9 @@ sshd_keygen() "${keygen}" -t "${type}" ${bitarg} -f "${f}" -N '' -q && \ printf "ssh-keygen: " && "${keygen}" -f "${f}" -l done << _EOF -dsa 1024 ssh_host_dsa_key 2 DSA -ecdsa 521 ssh_host_ecdsa_key 1 ECDSA -ed25519 -1 ssh_host_ed25519_key 1 ED25519 -rsa 0 ssh_host_rsa_key 2 RSA +ecdsa -1 ssh_host_ecdsa_key +ed25519 -1 ssh_host_ed25519_key +rsa 0 ssh_host_rsa_key _EOF ) } @@ -46,7 +45,19 @@ sshd_precmd() run_rc_command keygen } +sshd_check() +{ + sshd -t +} + +sshd_reload_precmd() +{ + run_rc_command check +} + +check_cmd=sshd_check keygen_cmd=sshd_keygen +reload_precmd=sshd_reload_precmd start_precmd=sshd_precmd load_rc_config $name
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Wed Jun 21 16:06:14 UTC 2023 Modified Files: src/etc/rc.d [netbsd-9]: sshd Log Message: Pull up following revision(s) (requested by kim in ticket #1643): etc/rc.d/sshd: revision 1.30 etc/rc.d/sshd: revision 1.33 etc/rc.d/sshd: revision 1.34 etc/rc.d/sshd: revision 1.35 simplify more (from rudolf) /etc/rc.d/sshd: New check cmd and reload precmd. - check cmd: run `sshd -t' to check sshd_config file - reload precmd: run check cmd before reloading so we don't nuke sshd if there's an error in the sshd_config file (It is still possible to effectively nuke sshd by changing the configuration tosomething that won't work on your network, but at least we avoid making sshd just exit on reload when you make a typo in a config option.) /etc/rc.d/sshd: Stop generating DSA host keys by default. If you want them you can generate them yourself, but in this day and age (Monday and 2023, specifically) there's no reason to be using DSA except for compatibility with ancient legacy software. /etc/rc.d/sshd: Use default curve for ECDSA keygen, not NIST P-521. The default is NIST P-256, which: (a) has plenty of cryptanalytic security, (b) performs better on essentially all platforms (smaller enough that even the advantage of the Mersenne prime structure of P-521 can't compete), and (c) likely gets more scrutiny on implementations than P-521 since it's more widespread. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.29.4.1 src/etc/rc.d/sshd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Fri Nov 26 18:04:09 UTC 2021 Modified Files: src/etc/rc.d [netbsd-9]: npf_boot pf_boot Log Message: Backout previous pullup from ticket #1377: etc/rc.d/npf_boot: revision 1.5 etc/rc.d/pf_boot: revision 1.8 To generate a diff of this commit: cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/etc/rc.d/npf_boot cvs rdiff -u -r1.4.52.2 -r1.4.52.3 src/etc/rc.d/pf_boot 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/npf_boot diff -u src/etc/rc.d/npf_boot:1.1.4.2 src/etc/rc.d/npf_boot:1.1.4.3 --- src/etc/rc.d/npf_boot:1.1.4.2 Fri Nov 26 16:50:18 2021 +++ src/etc/rc.d/npf_boot Fri Nov 26 18:04:09 2021 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: npf_boot,v 1.1.4.2 2021/11/26 16:50:18 martin Exp $ +# $NetBSD: npf_boot,v 1.1.4.3 2021/11/26 18:04:09 martin Exp $ # # PROVIDE: npf_boot @@ -29,5 +29,5 @@ npf_boot_start() /sbin/npfctl start } -load_rc_config $rcvar +load_rc_config $name run_rc_command "$1" Index: src/etc/rc.d/pf_boot diff -u src/etc/rc.d/pf_boot:1.4.52.2 src/etc/rc.d/pf_boot:1.4.52.3 --- src/etc/rc.d/pf_boot:1.4.52.2 Fri Nov 26 16:50:18 2021 +++ src/etc/rc.d/pf_boot Fri Nov 26 18:04:09 2021 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: pf_boot,v 1.4.52.2 2021/11/26 16:50:18 martin Exp $ +# $NetBSD: pf_boot,v 1.4.52.3 2021/11/26 18:04:09 martin Exp $ # # PROVIDE: pf_boot @@ -29,5 +29,5 @@ pf_boot_start() /sbin/pfctl -q -e } -load_rc_config $rcvar +load_rc_config $name run_rc_command "$1"
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Fri Nov 26 18:04:09 UTC 2021 Modified Files: src/etc/rc.d [netbsd-9]: npf_boot pf_boot Log Message: Backout previous pullup from ticket #1377: etc/rc.d/npf_boot: revision 1.5 etc/rc.d/pf_boot: revision 1.8 To generate a diff of this commit: cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/etc/rc.d/npf_boot cvs rdiff -u -r1.4.52.2 -r1.4.52.3 src/etc/rc.d/pf_boot Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Fri Nov 26 16:50:18 UTC 2021 Modified Files: src/etc/rc.d [netbsd-9]: npf_boot pf_boot Log Message: Pull up following revision(s) (requested by sborrill in ticket #1377): etc/rc.d/npf_boot: revision 1.5 etc/rc.d/pf_boot: revision 1.8 Load rc configuration based on rcvar, not name, so that correct settings in /etc/rc.conf.d are loaded. Usually this does not matter as rcvar and name are set to the same value. For pf_boot and npf_boot, rcvar is set to pf and npf respectively. Prior to the change, if: rc.conf contains nfp=YES rc.conf.d/npf does not exist Then: /etc/rc.d/npf_boot rcvar outputs: $npf=YES If: rc.conf contains npf=NO (or is not set) rc.conf.d/npf contains npf=YES Then: /etc/rc.d/npf_boot rcvar outputs: $npf=NO This means that in the latter case, at boot time the npfctl start command is never run and the firewall is not operational. To generate a diff of this commit: cvs rdiff -u -r1.1.4.1 -r1.1.4.2 src/etc/rc.d/npf_boot cvs rdiff -u -r1.4.52.1 -r1.4.52.2 src/etc/rc.d/pf_boot Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Fri Nov 26 16:50:18 UTC 2021 Modified Files: src/etc/rc.d [netbsd-9]: npf_boot pf_boot Log Message: Pull up following revision(s) (requested by sborrill in ticket #1377): etc/rc.d/npf_boot: revision 1.5 etc/rc.d/pf_boot: revision 1.8 Load rc configuration based on rcvar, not name, so that correct settings in /etc/rc.conf.d are loaded. Usually this does not matter as rcvar and name are set to the same value. For pf_boot and npf_boot, rcvar is set to pf and npf respectively. Prior to the change, if: rc.conf contains nfp=YES rc.conf.d/npf does not exist Then: /etc/rc.d/npf_boot rcvar outputs: $npf=YES If: rc.conf contains npf=NO (or is not set) rc.conf.d/npf contains npf=YES Then: /etc/rc.d/npf_boot rcvar outputs: $npf=NO This means that in the latter case, at boot time the npfctl start command is never run and the firewall is not operational. To generate a diff of this commit: cvs rdiff -u -r1.1.4.1 -r1.1.4.2 src/etc/rc.d/npf_boot cvs rdiff -u -r1.4.52.1 -r1.4.52.2 src/etc/rc.d/pf_boot 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/npf_boot diff -u src/etc/rc.d/npf_boot:1.1.4.1 src/etc/rc.d/npf_boot:1.1.4.2 --- src/etc/rc.d/npf_boot:1.1.4.1 Sun Oct 6 11:13:35 2019 +++ src/etc/rc.d/npf_boot Fri Nov 26 16:50:18 2021 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: npf_boot,v 1.1.4.1 2019/10/06 11:13:35 martin Exp $ +# $NetBSD: npf_boot,v 1.1.4.2 2021/11/26 16:50:18 martin Exp $ # # PROVIDE: npf_boot @@ -29,5 +29,5 @@ npf_boot_start() /sbin/npfctl start } -load_rc_config $name +load_rc_config $rcvar run_rc_command "$1" Index: src/etc/rc.d/pf_boot diff -u src/etc/rc.d/pf_boot:1.4.52.1 src/etc/rc.d/pf_boot:1.4.52.2 --- src/etc/rc.d/pf_boot:1.4.52.1 Sun Oct 6 11:13:35 2019 +++ src/etc/rc.d/pf_boot Fri Nov 26 16:50:18 2021 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: pf_boot,v 1.4.52.1 2019/10/06 11:13:35 martin Exp $ +# $NetBSD: pf_boot,v 1.4.52.2 2021/11/26 16:50:18 martin Exp $ # # PROVIDE: pf_boot @@ -29,5 +29,5 @@ pf_boot_start() /sbin/pfctl -q -e } -load_rc_config $name +load_rc_config $rcvar run_rc_command "$1"
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Tue Mar 9 16:01:24 UTC 2021 Modified Files: src/etc/rc.d [netbsd-9]: mountall Log Message: Pull up following revision(s) (requested by sborrill in ticket #1230): etc/rc.d/mountall: revision 1.15 Need to explicitly load value of zfs variable as zfs=YES may be set in /etc/rc.conf.d/zfs, not /etc/rc.conf. To generate a diff of this commit: cvs rdiff -u -r1.10.4.2 -r1.10.4.3 src/etc/rc.d/mountall 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/mountall diff -u src/etc/rc.d/mountall:1.10.4.2 src/etc/rc.d/mountall:1.10.4.3 --- src/etc/rc.d/mountall:1.10.4.2 Tue Feb 25 20:03:12 2020 +++ src/etc/rc.d/mountall Tue Mar 9 16:01:24 2021 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: mountall,v 1.10.4.2 2020/02/25 20:03:12 martin Exp $ +# $NetBSD: mountall,v 1.10.4.3 2021/03/09 16:01:24 martin Exp $ # # REQUIRE: mountcritremote named ypbind @@ -35,4 +35,5 @@ mountall_stop() } load_rc_config $name +load_rc_config_var zfs zfs run_rc_command "$1"
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Tue Mar 9 16:01:24 UTC 2021 Modified Files: src/etc/rc.d [netbsd-9]: mountall Log Message: Pull up following revision(s) (requested by sborrill in ticket #1230): etc/rc.d/mountall: revision 1.15 Need to explicitly load value of zfs variable as zfs=YES may be set in /etc/rc.conf.d/zfs, not /etc/rc.conf. To generate a diff of this commit: cvs rdiff -u -r1.10.4.2 -r1.10.4.3 src/etc/rc.d/mountall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: snj Date: Mon Dec 28 16:00:19 UTC 2020 Modified Files: src/etc/rc.d [netbsd-9]: ntpdate Log Message: Pull up following revision(s) (requested by martin in ticket #1164): etc/rc.d/ntpdate: revision 1.21 Adjust to "pool" usage in our standard ntp.conf, pointed out by Connor McLaughlan. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.50.1 src/etc/rc.d/ntpdate 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/ntpdate diff -u src/etc/rc.d/ntpdate:1.20 src/etc/rc.d/ntpdate:1.20.50.1 --- src/etc/rc.d/ntpdate:1.20 Mon Aug 3 18:43:48 2009 +++ src/etc/rc.d/ntpdate Mon Dec 28 16:00:19 2020 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: ntpdate,v 1.20 2009/08/03 18:43:48 perry Exp $ +# $NetBSD: ntpdate,v 1.20.50.1 2020/12/28 16:00:19 snj Exp $ # # PROVIDE: ntpdate @@ -21,7 +21,7 @@ ntpdate_start() ntpdate_hosts=$(awk ' /^#/{ next } /^(server|peer)[ \t]*127.127/ { next } - /^(server|peer)/ { if ($2 ~ /^-[46]/) + /^(server|peer|pool)/ { if ($2 ~ /^-[46]/) print $3 else print $2 }
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: snj Date: Mon Dec 28 16:00:19 UTC 2020 Modified Files: src/etc/rc.d [netbsd-9]: ntpdate Log Message: Pull up following revision(s) (requested by martin in ticket #1164): etc/rc.d/ntpdate: revision 1.21 Adjust to "pool" usage in our standard ntp.conf, pointed out by Connor McLaughlan. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.50.1 src/etc/rc.d/ntpdate Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Sat Jun 20 16:41:57 UTC 2020 Modified Files: src/etc/rc.d [netbsd-9]: postfix Log Message: Pull up following revision(s) (requested by rin in ticket #966): etc/rc.d/postfix: revision 1.19 little bit verbose for slow machines To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.16.1 src/etc/rc.d/postfix 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/postfix diff -u src/etc/rc.d/postfix:1.18 src/etc/rc.d/postfix:1.18.16.1 --- src/etc/rc.d/postfix:1.18 Sun Oct 30 15:47:06 2016 +++ src/etc/rc.d/postfix Sat Jun 20 16:41:57 2020 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postfix,v 1.18 2016/10/30 15:47:06 riastradh Exp $ +# $NetBSD: postfix,v 1.18.16.1 2020/06/20 16:41:57 martin Exp $ # # PROVIDE: mail @@ -64,6 +64,8 @@ postfix_precmd() ;; esac done + + echo "Starting ${name}." } postfix_op()
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Sat Jun 20 16:41:57 UTC 2020 Modified Files: src/etc/rc.d [netbsd-9]: postfix Log Message: Pull up following revision(s) (requested by rin in ticket #966): etc/rc.d/postfix: revision 1.19 little bit verbose for slow machines To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.16.1 src/etc/rc.d/postfix Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Sat May 2 16:24:11 UTC 2020 Modified Files: src/etc/rc.d [netbsd-9]: random_seed Log Message: Pull up following revision(s) (requested by riastradh in ticket #882): etc/rc.d/random_seed: revision 1.9 Don't delete the random seed before issuing `rndctl -S'. `rndctl -S' can replace the file just fine, and deleting it ahead of time adds a window during which we can lose the seed altogether if the system is interrupted by a crash or power outage. XXX pullup To generate a diff of this commit: cvs rdiff -u -r1.7.26.1 -r1.7.26.2 src/etc/rc.d/random_seed 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/random_seed diff -u src/etc/rc.d/random_seed:1.7.26.1 src/etc/rc.d/random_seed:1.7.26.2 --- src/etc/rc.d/random_seed:1.7.26.1 Sun Mar 1 11:53:09 2020 +++ src/etc/rc.d/random_seed Sat May 2 16:24:11 2020 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: random_seed,v 1.7.26.1 2020/03/01 11:53:09 martin Exp $ +# $NetBSD: random_seed,v 1.7.26.2 2020/05/02 16:24:11 martin Exp $ # # PROVIDE: random_seed @@ -93,8 +93,6 @@ random_save() oum="$(umask)" umask 077 - rm -Pf "${random_file}" - if ! fs_safe "$(dirname "${random_file}")"; then umask "${oum}" return 1
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Sat May 2 16:24:11 UTC 2020 Modified Files: src/etc/rc.d [netbsd-9]: random_seed Log Message: Pull up following revision(s) (requested by riastradh in ticket #882): etc/rc.d/random_seed: revision 1.9 Don't delete the random seed before issuing `rndctl -S'. `rndctl -S' can replace the file just fine, and deleting it ahead of time adds a window during which we can lose the seed altogether if the system is interrupted by a crash or power outage. XXX pullup To generate a diff of this commit: cvs rdiff -u -r1.7.26.1 -r1.7.26.2 src/etc/rc.d/random_seed Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Sun Mar 1 11:53:09 UTC 2020 Modified Files: src/etc/rc.d [netbsd-9]: random_seed Log Message: Pull up following revision(s) (requested by riastradh in ticket #743): etc/rc.d/random_seed: revision 1.8 Allow random seed on zfs. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.26.1 src/etc/rc.d/random_seed 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/random_seed diff -u src/etc/rc.d/random_seed:1.7 src/etc/rc.d/random_seed:1.7.26.1 --- src/etc/rc.d/random_seed:1.7 Tue Jul 22 17:11:09 2014 +++ src/etc/rc.d/random_seed Sun Mar 1 11:53:09 2020 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: random_seed,v 1.7 2014/07/22 17:11:09 wiz Exp $ +# $NetBSD: random_seed,v 1.7.26.1 2020/03/01 11:53:09 martin Exp $ # # PROVIDE: random_seed @@ -47,7 +47,7 @@ fs_safe() # fstype="$(getfstype "$1")" case "${fstype}" in - ffs|lfs|ext2fs|msdos|v7fs) + ffs|lfs|ext2fs|msdos|v7fs|zfs) return 0 ;; *)
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Sun Mar 1 11:53:09 UTC 2020 Modified Files: src/etc/rc.d [netbsd-9]: random_seed Log Message: Pull up following revision(s) (requested by riastradh in ticket #743): etc/rc.d/random_seed: revision 1.8 Allow random seed on zfs. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.26.1 src/etc/rc.d/random_seed Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Fri Jan 31 11:21:42 UTC 2020 Modified Files: src/etc/rc.d [netbsd-9]: ipsec Log Message: Pull up following revision(s) (requested by kim in ticket #676): etc/rc.d/ipsec: revision 1.16 Skip inet6 addresses that begin with fe80: (not just exact match). To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.15.2.1 src/etc/rc.d/ipsec 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/ipsec diff -u src/etc/rc.d/ipsec:1.15 src/etc/rc.d/ipsec:1.15.2.1 --- src/etc/rc.d/ipsec:1.15 Mon Aug 13 09:16:06 2018 +++ src/etc/rc.d/ipsec Fri Jan 31 11:21:42 2020 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: ipsec,v 1.15 2018/08/13 09:16:06 christos Exp $ +# $NetBSD: ipsec,v 1.15.2.1 2020/01/31 11:21:42 martin Exp $ # # PROVIDE: ipsec @@ -34,7 +34,7 @@ ipsec_getip() { case "$what" in inet) echo "local v4_addr=$address;";; inet6) case "$address" in - fe80:) ;; + fe80:*) ;; *) echo "local v6_addr=$address;";; esac;; esac
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Fri Jan 31 11:21:42 UTC 2020 Modified Files: src/etc/rc.d [netbsd-9]: ipsec Log Message: Pull up following revision(s) (requested by kim in ticket #676): etc/rc.d/ipsec: revision 1.16 Skip inet6 addresses that begin with fe80: (not just exact match). To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.15.2.1 src/etc/rc.d/ipsec Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Fri Jan 31 11:19:58 UTC 2020 Modified Files: src/etc/rc.d [netbsd-9]: autounmountd ip6addrctl Log Message: Pull up following revision(s) (requested by kim in ticket #675): etc/rc.d/autounmountd: revision 1.3 etc/rc.d/ip6addrctl: revision 1.4 Add NetBSD ID To generate a diff of this commit: cvs rdiff -u -r1.1.6.1 -r1.1.6.2 src/etc/rc.d/autounmountd cvs rdiff -u -r1.2.18.1 -r1.2.18.2 src/etc/rc.d/ip6addrctl 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/autounmountd diff -u src/etc/rc.d/autounmountd:1.1.6.1 src/etc/rc.d/autounmountd:1.1.6.2 --- src/etc/rc.d/autounmountd:1.1.6.1 Thu Aug 8 11:48:58 2019 +++ src/etc/rc.d/autounmountd Fri Jan 31 11:19:58 2020 @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD$ +# $NetBSD: autounmountd,v 1.1.6.2 2020/01/31 11:19:58 martin Exp $ # # PROVIDE: autounmountd Index: src/etc/rc.d/ip6addrctl diff -u src/etc/rc.d/ip6addrctl:1.2.18.1 src/etc/rc.d/ip6addrctl:1.2.18.2 --- src/etc/rc.d/ip6addrctl:1.2.18.1 Thu Aug 8 11:48:58 2019 +++ src/etc/rc.d/ip6addrctl Fri Jan 31 11:19:58 2020 @@ -1,6 +1,7 @@ #!/bin/sh # -# $FreeBSD: head/etc/rc.d/ip6addrctl 270836 2014-08-30 07:08:10Z hrs $ +# $NetBSD: ip6addrctl,v 1.2.18.2 2020/01/31 11:19:58 martin Exp $ +# FreeBSD: head/etc/rc.d/ip6addrctl 270836 2014-08-30 07:08:10Z hrs # # PROVIDE: ip6addrctl
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Fri Jan 31 11:19:58 UTC 2020 Modified Files: src/etc/rc.d [netbsd-9]: autounmountd ip6addrctl Log Message: Pull up following revision(s) (requested by kim in ticket #675): etc/rc.d/autounmountd: revision 1.3 etc/rc.d/ip6addrctl: revision 1.4 Add NetBSD ID To generate a diff of this commit: cvs rdiff -u -r1.1.6.1 -r1.1.6.2 src/etc/rc.d/autounmountd cvs rdiff -u -r1.2.18.1 -r1.2.18.2 src/etc/rc.d/ip6addrctl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Wed Dec 11 14:13:40 UTC 2019 Modified Files: src/etc/rc.d [netbsd-9]: zfs Log Message: Pull up following revision(s) (requested by sevan in ticket #539): etc/rc.d/zfs: revision 1.4 etc/rc.d/zfs: revision 1.5 We don't need to require the presence of /etc/zfs/zpool.cache to unmount & unload the module, just like for the start target. This script just makes sure that the ZFS module loads and unloads, mountall script takes care of mounting filesystems. Don't try to unmount all file systems before unloading the ZFS module, leave that to the operator in preperation or the mountall script to take care of. Module will of course fail to unload then if file systems are still mounted. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/etc/rc.d/zfs 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/zfs diff -u src/etc/rc.d/zfs:1.1.2.3 src/etc/rc.d/zfs:1.1.2.4 --- src/etc/rc.d/zfs:1.1.2.3 Sun Dec 8 14:42:01 2019 +++ src/etc/rc.d/zfs Wed Dec 11 14:13:40 2019 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: zfs,v 1.1.2.3 2019/12/08 14:42:01 martin Exp $ +# $NetBSD: zfs,v 1.1.2.4 2019/12/11 14:13:40 martin Exp $ # # PROVIDE: zfs @@ -28,8 +28,7 @@ zfs_start() zfs_stop() { - if [ -x /sbin/zfs -a -f /etc/zfs/zpool.cache ]; then - zfs unmount -a + if [ -x /sbin/zfs ]; then modunload zfs fi return 0;
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Wed Dec 11 14:13:40 UTC 2019 Modified Files: src/etc/rc.d [netbsd-9]: zfs Log Message: Pull up following revision(s) (requested by sevan in ticket #539): etc/rc.d/zfs: revision 1.4 etc/rc.d/zfs: revision 1.5 We don't need to require the presence of /etc/zfs/zpool.cache to unmount & unload the module, just like for the start target. This script just makes sure that the ZFS module loads and unloads, mountall script takes care of mounting filesystems. Don't try to unmount all file systems before unloading the ZFS module, leave that to the operator in preperation or the mountall script to take care of. Module will of course fail to unload then if file systems are still mounted. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/etc/rc.d/zfs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Sun Dec 8 14:42:02 UTC 2019 Modified Files: src/etc/rc.d [netbsd-9]: zfs Log Message: Pull up following revision(s) (requested by jmcneill in ticket #516): etc/rc.d/zfs: revision 1.2 etc/rc.d/zfs: revision 1.3 Attempt to load the zfs module even if /etc/zfs/zpool.cache is absent. The module needs to be loaded to create a pool in the first place, and autoloading won't work after the fact won't work at securelevel=1. Add missing rcvar=$name To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/etc/rc.d/zfs 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/zfs diff -u src/etc/rc.d/zfs:1.1.2.2 src/etc/rc.d/zfs:1.1.2.3 --- src/etc/rc.d/zfs:1.1.2.2 Fri Sep 27 09:18:37 2019 +++ src/etc/rc.d/zfs Sun Dec 8 14:42:01 2019 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: zfs,v 1.1.2.2 2019/09/27 09:18:37 martin Exp $ +# $NetBSD: zfs,v 1.1.2.3 2019/12/08 14:42:01 martin Exp $ # # PROVIDE: zfs @@ -10,12 +10,13 @@ $_rc_subr_loaded . /etc/rc.subr name="zfs" +rcvar=$name start_cmd="zfs_start" stop_cmd="zfs_stop" zfs_start() { - if [ -x /sbin/zfs -a -f /etc/zfs/zpool.cache ]; then + if [ -x /sbin/zfs ]; then # Get ZFS module loaded (and thereby, zvols created). /sbin/zfs list > /dev/null 2>&1 if [ $? -ne 0 ]; then
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Sun Dec 8 14:42:02 UTC 2019 Modified Files: src/etc/rc.d [netbsd-9]: zfs Log Message: Pull up following revision(s) (requested by jmcneill in ticket #516): etc/rc.d/zfs: revision 1.2 etc/rc.d/zfs: revision 1.3 Attempt to load the zfs module even if /etc/zfs/zpool.cache is absent. The module needs to be loaded to create a pool in the first place, and autoloading won't work after the fact won't work at securelevel=1. Add missing rcvar=$name To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/etc/rc.d/zfs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Sun Oct 6 11:13:35 UTC 2019 Modified Files: src/etc/rc.d [netbsd-9]: npf_boot pf_boot Log Message: Pull up following revision(s) (requested by sevan in ticket #288): etc/rc.d/npf_boot: revision 1.2 etc/rc.d/pf_boot: revision 1.5 No need to empose the script to be runnable during boot time, it prevents the script from wroking if the system is booted into single user mode & then moved onto multi-user mode. Reported by for NPF but the issue is there in PF too. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.4.1 src/etc/rc.d/npf_boot cvs rdiff -u -r1.4 -r1.4.52.1 src/etc/rc.d/pf_boot Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Sun Oct 6 11:13:35 UTC 2019 Modified Files: src/etc/rc.d [netbsd-9]: npf_boot pf_boot Log Message: Pull up following revision(s) (requested by sevan in ticket #288): etc/rc.d/npf_boot: revision 1.2 etc/rc.d/pf_boot: revision 1.5 No need to empose the script to be runnable during boot time, it prevents the script from wroking if the system is booted into single user mode & then moved onto multi-user mode. Reported by for NPF but the issue is there in PF too. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.4.1 src/etc/rc.d/npf_boot cvs rdiff -u -r1.4 -r1.4.52.1 src/etc/rc.d/pf_boot 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/npf_boot diff -u src/etc/rc.d/npf_boot:1.1 src/etc/rc.d/npf_boot:1.1.4.1 --- src/etc/rc.d/npf_boot:1.1 Tue Apr 2 01:50:32 2019 +++ src/etc/rc.d/npf_boot Sun Oct 6 11:13:35 2019 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: npf_boot,v 1.1 2019/04/02 01:50:32 sevan Exp $ +# $NetBSD: npf_boot,v 1.1.4.1 2019/10/06 11:13:35 martin Exp $ # # PROVIDE: npf_boot @@ -16,10 +16,6 @@ stop_cmd=":" npf_boot_start() { - if [ "$autoboot" != "yes" ]; then - err 1 "This script should only be executed at boot time." - fi - if [ -f /etc/npf.boot.conf ]; then /sbin/npfctl reload /etc/npf.boot.conf elif [ -f /etc/defaults/npf.boot.conf ]; then Index: src/etc/rc.d/pf_boot diff -u src/etc/rc.d/pf_boot:1.4 src/etc/rc.d/pf_boot:1.4.52.1 --- src/etc/rc.d/pf_boot:1.4 Sat Nov 22 20:23:33 2008 +++ src/etc/rc.d/pf_boot Sun Oct 6 11:13:35 2019 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: pf_boot,v 1.4 2008/11/22 20:23:33 tsutsui Exp $ +# $NetBSD: pf_boot,v 1.4.52.1 2019/10/06 11:13:35 martin Exp $ # # PROVIDE: pf_boot @@ -16,10 +16,6 @@ stop_cmd=":" pf_boot_start() { - if [ "$autoboot" != "yes" ]; then - err 1 "This script should only be executed at boot time." - fi - if [ -f /etc/pf.boot.conf ]; then /sbin/pfctl -q -f /etc/pf.boot.conf elif [ -f /etc/defaults/pf.boot.conf ]; then
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Thu Aug 8 11:48:59 UTC 2019 Modified Files: src/etc/rc.d [netbsd-9]: automount automountd autounmountd ip6addrctl Log Message: Pull up following revision(s) (requested by nakayama in ticket #30): etc/rc.d/autounmountd: revision 1.2 etc/rc.d/ip6addrctl: revision 1.3 etc/rc.d/automountd: revision 1.2 etc/rc.d/automount: revision 1.2 Add $_rc_subr_loaded before ". /etc/rc.subr" for speedup and consistency. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.6.1 src/etc/rc.d/automount src/etc/rc.d/automountd \ src/etc/rc.d/autounmountd cvs rdiff -u -r1.2 -r1.2.18.1 src/etc/rc.d/ip6addrctl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/rc.d
Module Name:src Committed By: martin Date: Thu Aug 8 11:48:59 UTC 2019 Modified Files: src/etc/rc.d [netbsd-9]: automount automountd autounmountd ip6addrctl Log Message: Pull up following revision(s) (requested by nakayama in ticket #30): etc/rc.d/autounmountd: revision 1.2 etc/rc.d/ip6addrctl: revision 1.3 etc/rc.d/automountd: revision 1.2 etc/rc.d/automount: revision 1.2 Add $_rc_subr_loaded before ". /etc/rc.subr" for speedup and consistency. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.6.1 src/etc/rc.d/automount src/etc/rc.d/automountd \ src/etc/rc.d/autounmountd cvs rdiff -u -r1.2 -r1.2.18.1 src/etc/rc.d/ip6addrctl 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/automount diff -u src/etc/rc.d/automount:1.1 src/etc/rc.d/automount:1.1.6.1 --- src/etc/rc.d/automount:1.1 Tue Jan 9 03:31:14 2018 +++ src/etc/rc.d/automount Thu Aug 8 11:48:58 2019 @@ -1,13 +1,13 @@ #!/bin/sh # -# $NetBSD: automount,v 1.1 2018/01/09 03:31:14 christos Exp $ +# $NetBSD: automount,v 1.1.6.1 2019/08/08 11:48:58 martin Exp $ # # PROVIDE: automount # REQUIRE: automountd # KEYWORD: nojail shutdown -. /etc/rc.subr +$_rc_subr_loaded . /etc/rc.subr name="automount" rcvar="autofs" Index: src/etc/rc.d/automountd diff -u src/etc/rc.d/automountd:1.1 src/etc/rc.d/automountd:1.1.6.1 --- src/etc/rc.d/automountd:1.1 Tue Jan 9 03:31:14 2018 +++ src/etc/rc.d/automountd Thu Aug 8 11:48:58 2019 @@ -1,13 +1,13 @@ #!/bin/sh # -# $NetBSD: automountd,v 1.1 2018/01/09 03:31:14 christos Exp $ +# $NetBSD: automountd,v 1.1.6.1 2019/08/08 11:48:58 martin Exp $ # # PROVIDE: automountd # REQUIRE: DAEMON # KEYWORD: nojail -. /etc/rc.subr +$_rc_subr_loaded . /etc/rc.subr name="automountd" rcvar="autofs" Index: src/etc/rc.d/autounmountd diff -u src/etc/rc.d/autounmountd:1.1 src/etc/rc.d/autounmountd:1.1.6.1 --- src/etc/rc.d/autounmountd:1.1 Tue Jan 9 03:31:14 2018 +++ src/etc/rc.d/autounmountd Thu Aug 8 11:48:58 2019 @@ -7,7 +7,7 @@ # REQUIRE: DAEMON # KEYWORD: nojail -. /etc/rc.subr +$_rc_subr_loaded . /etc/rc.subr name="autounmountd" rcvar="autofs" Index: src/etc/rc.d/ip6addrctl diff -u src/etc/rc.d/ip6addrctl:1.2 src/etc/rc.d/ip6addrctl:1.2.18.1 --- src/etc/rc.d/ip6addrctl:1.2 Wed Dec 23 04:38:00 2015 +++ src/etc/rc.d/ip6addrctl Thu Aug 8 11:48:58 2019 @@ -6,7 +6,7 @@ # PROVIDE: ip6addrctl # REQUIRE: root bootconf mountcritlocal tty -. /etc/rc.subr +$_rc_subr_loaded . /etc/rc.subr name="ip6addrctl" rcvar="ip6addrctl"