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 f6fecff0503678650c2f0d72e7037dd6e8c00756..b94f2f10735d1d8bc26a63fa1fb5e7da5cca863c 100644 (file)
--- 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 aed2d2db0b9af9b72ee6a71347adf7627dc104b5..4a19af120c8d9b9135603a6f9c6079280e9466c9 100644 (file)
--- 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()