Module Name: src
Committed By: roy
Date: Thu Jan 7 22:07:18 UTC 2016
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/misc: mi
src/etc/mtree: NetBSD.dist.base
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1119 -r1.1120 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.196 -r1.197 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.150 -r1.151 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1119 src/distrib/sets/lists/base/mi:1.1120
--- src/distrib/sets/lists/base/mi:1.1119 Sat Dec 12 23:42:43 2015
+++ src/distrib/sets/lists/base/mi Thu Jan 7 22:07:18 2016
@@ -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
Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.196 src/distrib/sets/lists/misc/mi:1.197
--- src/distrib/sets/lists/misc/mi:1.196 Sun Aug 23 18:28:40 2015
+++ src/distrib/sets/lists/misc/mi Thu Jan 7 22:07:18 2016
@@ -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
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.150 src/etc/mtree/NetBSD.dist.base:1.151
--- src/etc/mtree/NetBSD.dist.base:1.150 Mon Nov 23 19:56:47 2015
+++ src/etc/mtree/NetBSD.dist.base Thu Jan 7 22:07:18 2016
@@ -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
Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.27 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.28
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.27 Thu Oct 22 10:51:16 2015
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Thu Jan 7 22:07:18 2016
@@ -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 @@ CONFIGFILES= dhcpcd.conf
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 \
