Install the lookup-hostname script by default but don't run it by default.

diff --git a/dhcpcd-hooks/Makefile b/dhcpcd-hooks/Makefile
index cfb19f70bb215e9e45aea10cf35ad8759e99bb3f..205fdd81affd2e937f38d068d52ec30071acc8b8 100644 (file)
--- a/dhcpcd-hooks/Makefile
+++ b/dhcpcd-hooks/Makefile
@@ -1,6 +1,6 @@
 LIBEXECDIR?=   ${PREFIX}/libexec
 HOOKDIR=       ${LIBEXECDIR}/dhcpcd-hooks
-SYSTEMSCRIPTS= 01-test 10-mtu 20-resolv.conf 30-hostname
+SYSTEMSCRIPTS= 01-test 10-mtu 20-resolv.conf 29-lookup-hostname 30-hostname
 FILES=         ${SYSTEMSCRIPTS} ${HOOKSCRIPTS}
 FILESDIR=      ${HOOKDIR}
 

diff --git a/dhcpcd.conf b/dhcpcd.conf
index 78e55fcb73d64c09b53b2ffd9a80036cd4df3fb2..98705f24e39e39218ad163a7df8b0eb999a08d97 100644 (file)
--- a/dhcpcd.conf
+++ b/dhcpcd.conf
@@ -13,3 +13,7 @@ option ntp_servers
 # However, a lot of buggy DHCP servers set invalid MTUs so this is not
 # enabled by default.
 #option interface_mtu
+
+# We provide a hook script to lookup the hostname if not set by the DHCP
+# server, but we should not run it by default.
+nohook lookup-hostname