[Midnightbsd-cvs] [MidnightBSD/src] 95a423: etcupdate: Don't rotate trees for a dry run.

[Lucas Holt]

  Branch: refs/heads/master
  Home:   https://github.com/MidnightBSD/src
  Commit: 95a423b6047bfde706e3c6818b691f47cff95e0b
      https://github.com/MidnightBSD/src/commit/95a423b6047bfde706e3c6818b691f47cff95e0b
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2022-12-31 (Sat, 31 Dec 2022)

  Changed paths:
    M usr.sbin/etcupdate/etcupdate.sh

  Log Message:
  -----------
  etcupdate: Don't rotate trees for a dry run.
When performing a dry run, remove the temporary tree created rather
than rotating the trees.  Rotating the trees meant that etcupdate
thought the latest changes were already merged and would not merge
them on the next real run.


  Commit: 19955c7d737a56525a58fc31f27fb27ffd3c5df5
      https://github.com/MidnightBSD/src/commit/19955c7d737a56525a58fc31f27fb27ffd3c5df5
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2022-12-31 (Sat, 31 Dec 2022)

  Changed paths:
    M sys/netpfil/ipfilter/netinet/mlfk_ipl.c

  Log Message:
  -----------
  Simplify dynamic ipfilter sysctls.
Pass the structure offset in arg2 instead of arg1.  This avoids
having to undo the pointer arithmetic on arg1.  Instead arg2 can
be used directly as an offset relative to the desired structure.

Obtained from: CheriBSD


Compare: https://github.com/MidnightBSD/src/compare/3af004437333...19955c7d737a