Move the duid file to /etc/dhcpcd as it's really a config file. Also, rename hook dirs to dhcpcd- so they could be installed into /etc and not just /etc/dhcpcd.

1 files changed, 6 insertions, 7 deletions

diff --git a/config.h b/config.h
index f8bb018c..bda7efb8 100644
--- a/config.h
+++ b/config.h
@@ -49,21 +49,20 @@
 
 #define PACKAGE			"dhcpcd"
 
-#define RESOLVFILE		"/etc/resolv.conf"
 #ifndef SYSCONFDIR
-# define SYSCONFDIR		"/etc"
+# define SYSCONFDIR		"/etc/" PACKAGE
 #endif
-#define DEFAULTSCRIPT		SYSCONFDIR "/" PACKAGE ".sh"
-
 #ifndef RUNDIR
 # define RUNDIR			"/var/run"
 #endif
-#define PIDFILE			RUNDIR "/" PACKAGE "-%s.pid"
-
 #ifndef DBDIR
 # define DBDIR			"/var/db"
 #endif
+
+#define RESOLVFILE		"/etc/resolv.conf"
+#define DEFAULTSCRIPT		SYSCONFDIR "/" PACKAGE ".sh"
+#define DUIDFILE		SYSCONFDIR "/" PACKAGE ".duid"
 #define LEASEFILE		DBDIR "/" PACKAGE "-%s.lease"
-#define DUIDFILE		DBDIR "/" PACKAGE ".duid"
+#define PIDFILE			RUNDIR "/" PACKAGE "-%s.pid"
 
 #endif