Move the duid file to /etc/dhcpcd as it's really a config file. Also, rename hook...

diff --git a/config.h b/config.h
index f8bb018ccf81c3f69b4ab55a5a1f3a16a98aafc3..bda7efb824da328f3a98d7020b5492fdee7787a4 100644 (file)
--- 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

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index f8928b0b8bb9d4394e85fe50fbd49ccceeadba58..12f0b83aa9c4a0a6af980e729befaad33f877d57 100644 (file)
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -327,7 +327,7 @@ Linux Socket Filter, or LPF device on Linux based systems.
 .Bl -ohang
 .It Pa @SYSCONFDIR@/dhcpcd.sh
 Bourne shell script that is run when we configure or deconfigure an interface.
-.It Pa @DBDIR@/dhcpcd.duid
+.It Pa @SYSCONFDIR@/dhcpcd.duid
 Text file that holds the DUID used to identify the host.
 .It Pa @DBDIR@/dhcpcd- Ns Ar interface Ns .lease
 The actual DHCP message send by the server. We use this when reading the last

diff --git a/dhcpcd.sh.in b/dhcpcd.sh.in
index a2763e9d814f2bb8b4024b1cd40b5aa1e6387166..fd16855419b8c53ffb8093812a067fc4f52c0eee 100644 (file)
--- a/dhcpcd.sh.in
+++ b/dhcpcd.sh.in
@@ -27,7 +27,7 @@
 do_hooks()
 {
        local x= r=0
-       for x in @SYSCONFDIR@/"$1"-hook.d/* @SYSCONFDIR@/"$1"-hook; do
+       for x in @SYSCONFDIR@/dhcpcd-"$1"-hook.d/* @SYSCONFDIR@/dhcpcd-"$1"-hook; do
                if [ -e "${x}" ]; then
                        . "${x}"
                        r=$((${r} + $?))