From: Roy Marples <roy@marples.name>
Date: Thu, 14 Aug 2008 12:17:23 +0000 (+0000)
Subject: Set the main state dir in the main hook script.
X-Git-Tag: v4.0.2~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=697033263dcdbca3e2946301d574ac9c6aaf7553;p=thirdparty%2Fdhcpcd.git

Set the main state dir in the main hook script.
---

diff --git a/dhcpcd-hooks/20-resolv.conf b/dhcpcd-hooks/20-resolv.conf
index f6fecff0..b94f2f10 100644
--- a/dhcpcd-hooks/20-resolv.conf
+++ b/dhcpcd-hooks/20-resolv.conf
@@ -7,7 +7,7 @@
 # or dnsmasq. This is important as the libc resolver isn't that powerful.
 
 # We store our resolvconfs in /var/run so they are cleaned at boot.
-resolvconf_dir=/var/run/dhcpcd/resolv.conf
+resolvconf_dir="${state_dir}/resolv.conf"
 
 build_resolv_conf()
 {
diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
index aed2d2db..4a19af12 100644
--- a/dhcpcd-run-hooks.in
+++ b/dhcpcd-run-hooks.in
@@ -6,6 +6,7 @@ signature_base="# Generated by dhcpcd from "
 signature="${signature_base}${interface}"
 signature_base_end="# End of dhcpcd from "
 signature_end="${signature_base_end}${interface}"
+state_dir="/var/run/dhcpcd"
 
 # Ensure that all arguments are unique
 uniqify()