On 2021/02/01 09:22, Theo de Raadt wrote: > It should use 'demotion counter' everywhere.
Index: sbin/ifconfig/ifconfig.8 =================================================================== RCS file: /cvs/src/sbin/ifconfig/ifconfig.8,v retrieving revision 1.360 diff -u -p -r1.360 ifconfig.8 --- sbin/ifconfig/ifconfig.8 17 Jan 2021 20:35:31 -0000 1.360 +++ sbin/ifconfig/ifconfig.8 1 Feb 2021 16:34:26 -0000 @@ -1405,17 +1405,17 @@ Specify the group. .It Cm carpdemote Op Ar number Increase .Xr carp 4 -demote count for given interface group by +demotion counter for given interface group by .Ar number . Acceptable values are 0 to 128. If .Ar number is omitted, it is increased by 1. -Demote count can be set up to 255. +The maximum value for a demotion counter is 255. .It Cm -carpdemote Op Ar number Decrease .Xr carp 4 -demote count for given interface group by +demotion counter for given interface group by .Ar number . Acceptable values are 0 to 128. If Index: usr.sbin/sasyncd/sasyncd.conf.5 =================================================================== RCS file: /cvs/src/usr.sbin/sasyncd/sasyncd.conf.5,v retrieving revision 1.19 diff -u -p -r1.19 sasyncd.conf.5 --- usr.sbin/sasyncd/sasyncd.conf.5 10 Feb 2020 13:18:22 -0000 1.19 +++ usr.sbin/sasyncd/sasyncd.conf.5 1 Feb 2021 16:34:26 -0000 @@ -77,7 +77,7 @@ should track master/slave state on. .Xc Specify on which interface group .Xr sasyncd 8 -should increase the demote counter. +should increase the demotion counter. This has the effect of suppressing .Xr carp 4 preemption while initial Index: share/man/man4/pfsync.4 =================================================================== RCS file: /cvs/src/share/man/man4/pfsync.4,v retrieving revision 1.36 diff -u -p -r1.36 pfsync.4 --- share/man/man4/pfsync.4 30 Aug 2016 13:56:14 -0000 1.36 +++ share/man/man4/pfsync.4 1 Feb 2021 16:34:26 -0000 @@ -130,6 +130,14 @@ Only run the pfsync protocol on a truste dedicated to pfsync messages such as a crossover cable between two firewalls. .\" or specify a peer address and protect the traffic with .\" .Xr ipsec 4 . +.Pp +.Nm +will increase the +.Xr carp 4 +demotion counter for any interface groups associated with the interface +by 32 during initialisation, and by 1 if the +.Nm +link is down or if a bulk update fails. .Sh EXAMPLES .Nm and
