[src/trunk]: src Move 10-wpa_supplicant, 15-timezone, 29-lookup-hostname and ...

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

details:   https://anonhg.NetBSD.org/src/rev/25e67262b66b
branches:  trunk
changeset: 812909:25e67262b66b
user:      roy <roy%NetBSD.org@localhost>
date:      Thu Jan 07 22:07:18 2016 +0000

description:
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 +++-
 external/bsd/dhcpcd/sbin/dhcpcd/Makefile |  14 +++++++++++---
 4 files changed, 28 insertions(+), 12 deletions(-)

diffs (109 lines):

diff -r 4abb8fb63046 -r 25e67262b66b distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Thu Jan 07 22:03:00 2016 +0000
+++ b/distrib/sets/lists/base/mi        Thu Jan 07 22:07:18 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1119 2015/12/12 23:42:43 christos Exp $
+# $NetBSD: mi,v 1.1120 2016/01/07 22:07:18 roy Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -405,13 +405,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
@@ -2125,6 +2125,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 4abb8fb63046 -r 25e67262b66b distrib/sets/lists/misc/mi
--- a/distrib/sets/lists/misc/mi        Thu Jan 07 22:03:00 2016 +0000
+++ b/distrib/sets/lists/misc/mi        Thu Jan 07 22:07:18 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.196 2015/08/23 18:28:40 mrg Exp $
+# $NetBSD: mi,v 1.197 2016/01/07 22:07:18 roy 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 4abb8fb63046 -r 25e67262b66b etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base        Thu Jan 07 22:03:00 2016 +0000
+++ b/etc/mtree/NetBSD.dist.base        Thu Jan 07 22:07:18 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist.base,v 1.150 2015/11/23 19:56:47 christos Exp $
+#      $NetBSD: NetBSD.dist.base,v 1.151 2016/01/07 22:07:18 roy Exp $
 #      @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -350,6 +350,8 @@
 ./usr/share/examples/atf
 ./usr/share/examples/blacklist
 ./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
diff -r 4abb8fb63046 -r 25e67262b66b external/bsd/dhcpcd/sbin/dhcpcd/Makefile
--- a/external/bsd/dhcpcd/sbin/dhcpcd/Makefile  Thu Jan 07 22:03:00 2016 +0000
+++ b/external/bsd/dhcpcd/sbin/dhcpcd/Makefile  Thu Jan 07 22:07:18 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/10/22 10:51:16 roy Exp $
+# $NetBSD: Makefile,v 1.28 2016/01/07 22:07:18 roy Exp $
 #
 
 PROG=          dhcpcd
@@ -39,13 +39,21 @@
 FILESDIR_dhcpcd.conf=          /etc
 FILESMODE_dhcpcd.conf=         644     # -rw-r--r--
 
-HOOKS=                 01-test 02-dump 10-wpa_supplicant 15-timezone
-HOOKS+=                        20-resolv.conf 29-lookup-hostname 30-hostname
+HOOKS=                 01-test 02-dump 20-resolv.conf 30-hostname
 HOOKS+=                        50-ntp.conf
 
 FILES=                 ${HOOKS:C,^,${DIST}/dhcpcd-hooks/,}
 FILESDIR=              /libexec/dhcpcd-hooks
 
+EGHOOKS=               10-wpa_supplicant 15-timezone 29-lookup-hostname
+EGHOOKS+=              50-ypbind
+
+EGFILES=               ${EGHOOKS:C,^,${DIST}/dhcpcd-hooks/,}
+FILES+=                        ${EGFILES}
+.for f in ${EGFILES}
+FILESDIR_${f}=         /usr/share/examples/dhcpcd/hooks
+.endfor
+
 MAN=                   dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8
 
 CLEANFILES=            dhcpcd.conf.5 dhcpcd.8 \