[src/netbsd-7]: src Pull up following revision(s) (requested by roy in ticket...

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

details:   https://anonhg.NetBSD.org/src/rev/e9399aa42acf
branches:  netbsd-7
changeset: 800509:e9399aa42acf
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jul 29 06:44:19 2018 +0000

description:
Pull up following revision(s) (requested by roy in ticket #1621):

        distrib/sets/lists/misc/mi: revision 1.197
        etc/mtree/NetBSD.dist.base: revision 1.151
        distrib/sets/lists/base/mi: revision 1.1120

Move 10-wpa_supplicant, 15-timezone, 29-lookup-hostname and 50-ypbind
from /libexec/dhcpcd-hooks to /usr/share/examples/dhcpcd/hooks so they
are not run by default.

diffstat:

 distrib/sets/lists/base/mi |  16 +++++++++-------
 distrib/sets/lists/misc/mi |   6 +++++-
 etc/mtree/NetBSD.dist.base |   4 +++-
 3 files changed, 17 insertions(+), 9 deletions(-)

diffs (76 lines):

diff -r 83929029f3b4 -r e9399aa42acf distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Sun Jul 29 06:38:34 2018 +0000
+++ b/distrib/sets/lists/base/mi        Sun Jul 29 06:44:19 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1087.2.13 2018/07/29 06:38:34 martin Exp $
+# $NetBSD: mi,v 1.1087.2.14 2018/07/29 06:44:19 martin Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -409,13 +409,13 @@
 ./libexec/dhcpcd-hooks/01-test                 base-dhcpcd-root
 ./libexec/dhcpcd-hooks/02-dump                 base-dhcpcd-root
 ./libexec/dhcpcd-hooks/10-mtu                  base-obsolete      obsolete
-./libexec/dhcpcd-hooks/10-resolv.conf          base-obsolete                   obsolete
-./libexec/dhcpcd-hooks/10-wpa_supplicant       base-dhcpcd-root
-./libexec/dhcpcd-hooks/14-lookup-hostname      base-obsolete                   obsolete
-./libexec/dhcpcd-hooks/15-hostname             base-obsolete                   obsolete
-./libexec/dhcpcd-hooks/15-timezone             base-dhcpcd-root
+./libexec/dhcpcd-hooks/10-resolv.conf          base-obsolete      obsolete
+./libexec/dhcpcd-hooks/10-wpa_supplicant       base-obsolete      obsolete
+./libexec/dhcpcd-hooks/14-lookup-hostname      base-obsolete      obsolete
+./libexec/dhcpcd-hooks/15-hostname             base-obsolete      obsolete
+./libexec/dhcpcd-hooks/15-timezone             base-obsolete      obsolete
 ./libexec/dhcpcd-hooks/20-resolv.conf          base-dhcpcd-root
-./libexec/dhcpcd-hooks/29-lookup-hostname      base-dhcpcd-root
+./libexec/dhcpcd-hooks/29-lookup-hostname      base-obsolete      obsolete
 ./libexec/dhcpcd-hooks/30-hostname             base-dhcpcd-root
 ./libexec/dhcpcd-hooks/50-ntp.conf             base-dhcpcd-root
 ./libexec/dhcpcd-run-hooks                     base-dhcpcd-root
@@ -2118,6 +2118,8 @@
 ./usr/share/examples/blacklist/blacklistd.conf base-sys-examples
 ./usr/share/examples/blacklist/npf.conf                base-sys-examples
 ./usr/share/examples/dhcp                      base-dhcpd-examples
+./usr/share/examples/dhcpcd                    base-dhcpcd-examples
+./usr/share/examples/dhcpcd/hooks              base-dhcpcd-examples
 ./usr/share/examples/disktab                   base-sys-examples
 ./usr/share/examples/emul                      base-sys-examples
 ./usr/share/examples/emul/linux                        base-sys-examples
diff -r 83929029f3b4 -r e9399aa42acf distrib/sets/lists/misc/mi
--- a/distrib/sets/lists/misc/mi        Sun Jul 29 06:38:34 2018 +0000
+++ b/distrib/sets/lists/misc/mi        Sun Jul 29 06:44:19 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.194 2014/07/20 15:58:40 tron Exp $
+# $NetBSD: mi,v 1.194.2.1 2018/07/29 06:44:19 martin Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1360,6 +1360,10 @@
 ./usr/share/examples/atf/tests-results.css     misc-atf-examples       share,atf,!kyua
 ./usr/share/examples/atf/tests-results.css     misc-obsolete           share,kyua,obsolete
 ./usr/share/examples/dhcp/dhcpd.conf           misc-dhcpd-examples     share
+./usr/share/examples/dhcpcd/hooks/10-wpa_supplicant    misc-dhcpcd-examples    share
+./usr/share/examples/dhcpcd/hooks/15-timezone  misc-dhcpcd-examples    share
+./usr/share/examples/dhcpcd/hooks/29-lookup-hostname   misc-dhcpcd-examples    share
+./usr/share/examples/dhcpcd/hooks/50-ypbind    misc-dhcpcd-examples    share
 ./usr/share/examples/disktab/disktab           misc-sys-examples       share
 ./usr/share/examples/emul/linux/etc/LINUX_MAKEDEV      misc-sys-examples       share
 ./usr/share/examples/emul/svr4/etc/SVR4_MAKEDEV        misc-sys-examples       share
diff -r 83929029f3b4 -r e9399aa42acf etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base        Sun Jul 29 06:38:34 2018 +0000
+++ b/etc/mtree/NetBSD.dist.base        Sun Jul 29 06:44:19 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist.base,v 1.139.2.3 2017/07/25 19:43:00 snj Exp $
+#      $NetBSD: NetBSD.dist.base,v 1.139.2.4 2018/07/29 06:44:19 martin Exp $
 #      @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -341,6 +341,8 @@
 ./usr/share/examples/asm/hello
 ./usr/share/examples/atf
 ./usr/share/examples/dhcp
+./usr/share/examples/dhcpcd
+./usr/share/examples/dhcpcd/hooks
 ./usr/share/examples/disktab
 ./usr/share/examples/emul
 ./usr/share/examples/emul/linux