Move lookup-hostname hook to the example directory.

diff --git a/README b/README
index a09b93cfe920b6acef72134a8b208b2ed935c617..bfc31b1daadbc335901fd66a672b7e09a60f091e 100644 (file)
--- a/README
+++ b/README
@@ -122,7 +122,9 @@ Hooks
 Not all the hooks in dhcpcd-hooks are installed by default.
 By default we install 01-test, 02-dump, 10-mtu, 10-wpa_supplicant,
 15-timezone, 20-resolv.conf, 29-lookup-hostname and 30-hostname.
-The default dhcpcd.conf disables the lookup-hostname hook by default.
+The other hooks, 15-timezone, 29-lookup-hostname are installed
+to $(datadir)/dhcpcd/hooks by default and need to be copied to
+$(libexecdir)/dhcpcd-hooks for use.
 The configure program attempts to find hooks for systems you have installed.
 To add more simply
 ./configure -with-hook=ntp.conf

diff --git a/dhcpcd-hooks/Makefile b/dhcpcd-hooks/Makefile
index 91cd56a69ee284fe81566de7657686b4f0473087..5f3087b6d43b5acba8afa0c1a264cf649f8bfe81 100644 (file)
--- a/dhcpcd-hooks/Makefile
+++ b/dhcpcd-hooks/Makefile
@@ -5,12 +5,13 @@ include ${TOP}/iconfig.mk
 SCRIPTSDIR=    ${LIBEXECDIR}/dhcpcd-hooks
 SCRIPTS=       01-test 02-dump
 SCRIPTS+=      10-wpa_supplicant 20-resolv.conf
-SCRIPTS+=      29-lookup-hostname 30-hostname
+SCRIPTS+=      30-hostname
 SCRIPTS+=      ${HOOKSCRIPTS}
 
 # Some hooks should not be installed by default
 FILESDIR=      ${DATADIR}/dhcpcd/hooks
 FILES=         15-timezone
+FILES+=                29-lookup-hostname
 
 50-ypbind: 50-ypbind.in
        ${SED} \

diff --git a/dhcpcd.conf b/dhcpcd.conf
index 3108599405a156847cb15b8c6c3c814ca5482507..aeba3567004ff6caf655142396b86f9d3c499891 100644 (file)
--- a/dhcpcd.conf
+++ b/dhcpcd.conf
@@ -36,7 +36,3 @@ require dhcp_server_identifier
 
 # Generate Stable Private IPv6 Addresses instead of hardware based ones
 slaac private
-
-# A hook script is provided to lookup the hostname if not set by the DHCP
-# server, but it should not be run by default.
-nohook lookup-hostname