Pass the correct run directory to dhcpcd-run-hooks

diff --git a/Makefile b/Makefile
index b619be28bbcf297efb128d97815ea81251f5b022..a66bf1f36b9387ff701797c89aeb5cafc16719a6 100644 (file)
--- 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 bba48c74c24ab4c722c5ad51c1a197098a9f166c..6961ed3bb32c1848b4cdb20ea2a9ff0c1b1a7715 100644 (file)
--- 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}