From: Roy Marples <roy@marples.name>
Date: Sat, 9 May 2009 20:55:36 +0000 (+0000)
Subject: Install the lookup-hostname script by default but don't run it by default.
X-Git-Tag: v5.0.2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=489188f618ea7c100051ba6d967d3d765be1ffc3;p=thirdparty%2Fdhcpcd.git

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 cfb19f70..205fdd81 100644
--- 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 78e55fcb..98705f24 100644
--- 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