[src/trunk]: src/etc dhcpcd: Empty the chroot

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9e1b9c962505
branches:  trunk
changeset: 972617:9e1b9c962505
user:      roy <roy%NetBSD.org@localhost>
date:      Sun May 31 12:58:09 2020 +0000

description:
dhcpcd: Empty the chroot

While here, set correct optional hooks.

diffstat:

 etc/defaults/rc.conf       |  3 +--
 etc/mtree/NetBSD.dist.base |  7 +------
 etc/mtree/special          |  6 +++---
 etc/rc.d/dhcpcd            |  3 +--
 4 files changed, 6 insertions(+), 13 deletions(-)

diffs (74 lines):

diff -r 05864fe94006 -r 9e1b9c962505 etc/defaults/rc.conf
--- a/etc/defaults/rc.conf      Sun May 31 12:52:11 2020 +0000
+++ b/etc/defaults/rc.conf      Sun May 31 12:58:09 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: rc.conf,v 1.155 2020/05/24 14:46:19 jmcneill Exp $
+#      $NetBSD: rc.conf,v 1.156 2020/05/31 12:58:09 roy Exp $
 #
 # /etc/defaults/rc.conf --
 #      default configuration of /etc/rc.conf
@@ -193,7 +193,6 @@
 net_interfaces=""                              # used only if above is NO
 flushroutes=YES                                        # flush routes in netstart
 dhcpcd=NO              dhcpcd_flags="-qM"      # For ifconfig_XXX=dhcp.
-dhcpcd_chrootdir="/var/chroot/dhcpcd"
 ntpdate=NO             ntpdate_flags="-b -s"   # May need '-u' thru firewall
 ppp=YES                        ppp_peers=""            # /etc/ppp/peers to call
 ip6mode=host                                   # host, autohost or router
diff -r 05864fe94006 -r 9e1b9c962505 etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base        Sun May 31 12:52:11 2020 +0000
+++ b/etc/mtree/NetBSD.dist.base        Sun May 31 12:58:09 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist.base,v 1.217 2020/05/30 20:47:59 christos Exp $
+#      $NetBSD: NetBSD.dist.base,v 1.218 2020/05/31 12:58:09 roy Exp $
 #      @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -1276,11 +1276,6 @@
 ./var/backups
 ./var/chroot
 ./var/chroot/dhcpcd
-./var/chroot/dhcpcd/etc
-./var/chroot/dhcpcd/var
-./var/chroot/dhcpcd/var/run
-./var/chroot/dhcpcd/var/db
-./var/chroot/dhcpcd/var/db/dhcpcd      mode=0775 uname=_dhcpcd gname=_dhcpcd
 ./var/chroot/ftp-proxy         mode=0755
 ./var/chroot/named
 ./var/chroot/named/dev
diff -r 05864fe94006 -r 9e1b9c962505 etc/mtree/special
--- a/etc/mtree/special Sun May 31 12:52:11 2020 +0000
+++ b/etc/mtree/special Sun May 31 12:58:09 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: special,v 1.167 2019/05/11 19:31:03 maxv Exp $
+#      $NetBSD: special,v 1.168 2020/05/31 12:58:09 roy Exp $
 #      @(#)special     8.2 (Berkeley) 1/23/94
 #
 # This file may be overwritten on upgrades.
@@ -64,8 +64,8 @@
 ./etc/defaults/security.conf   type=file mode=0444
 ./etc/defaults/weekly.conf     type=file mode=0444
 ./etc/dhcpcd.conf              type=file mode=0644
-./etc/dhcpcd.duid              type=file mode=0644 optional
-./etc/dhcpcd.hook              type=file mode=0644 optional
+./etc/dhcpcd.enter-hook                type=file mode=0644 optional
+./etc/dhcpcd.exit-hook         type=file mode=0644 optional
 ./etc/dhcpd.conf               type=file mode=0644 optional
 ./etc/dhcpd6.conf              type=file mode=0644 optional
 ./etc/disktab                  type=file mode=0644
diff -r 05864fe94006 -r 9e1b9c962505 etc/rc.d/dhcpcd
--- a/etc/rc.d/dhcpcd   Sun May 31 12:52:11 2020 +0000
+++ b/etc/rc.d/dhcpcd   Sun May 31 12:58:09 2020 +0000
@@ -1,11 +1,10 @@
 #!/bin/sh
 
-# $NetBSD: dhcpcd,v 1.8 2020/04/02 12:58:49 roy Exp $
+# $NetBSD: dhcpcd,v 1.9 2020/05/31 12:58:09 roy Exp $
 
 # PROVIDE: dhcpcd
 # REQUIRE: network mountcritlocal
 # BEFORE:  NETWORKING
-# KEYWORD: chrootdir
 
 $_rc_subr_loaded . /etc/rc.subr