From a5b1adf30817fcfd38b202bc972bd6b02450554b Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Sat, 21 Sep 2013 14:31:06 +0000
Subject: [PATCH] Pass the correct run directory to dhcpcd-run-hooks

---
 Makefile            | 5 +++--
 dhcpcd-run-hooks.in | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b619be28..a66bf1f3 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@ FILESDIR=	${SYSCONFDIR}
 
 SUBDIRS=	dhcpcd-hooks ${MKDIRS}
 
+SED_RUNDIR=		-e 's:@RUNDIR@:${RUNDIR}:g'
 SED_DBDIR=		-e 's:@DBDIR@:${DBDIR}:g'
 SED_LIBDIR=		-e 's:@LIBDIR@:${LIBDIR}:g'
 SED_HOOKDIR=		-e 's:@HOOKDIR@:${HOOKDIR}:g'
@@ -58,8 +59,8 @@ CLEANFILES+=	*.tar.bz2
 .SUFFIXES:	.in
 
 .in:
-	${SED} ${SED_DBDIR} ${SED_LIBDIR} ${SED_HOOKDIR} ${SED_SCRIPT} \
-		${SED_SYS} \
+	${SED} ${SED_RUNDIR} ${SED_DBDIR} ${SED_LIBDIR} ${SED_HOOKDIR} \
+		${SED_SYS} ${SED_SCRIPT} \
 		${SED_SERVICEEXISTS} ${SED_SERVICECMD} ${SED_SERVICESTATUS} \
 		$< > $@
 
diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
index bba48c74..6961ed3b 100644
--- a/dhcpcd-run-hooks.in
+++ b/dhcpcd-run-hooks.in
@@ -17,7 +17,7 @@ signature_base="# Generated by dhcpcd"
 signature="$signature_base $from $ifname"
 signature_base_end="# End of dhcpcd"
 signature_end="$signature_base_end $from $ifname"
-state_dir=/var/run/dhcpcd
+state_dir=@RUNDIR@/dhcpcd
 
 : ${if_up:=false}
 : ${if_down:=false}
-- 
2.47.3