Move dhcpcd.sh to dhcpcd-run-hooks and remove .sh suffixes

diff --git a/Makefile b/Makefile
index 468f57aea699c9d0fb8008f96cb6e33302008bf8..838cd9b5895a3b1a7ee6e285df37f6d052fe4add 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,19 +8,19 @@ SRCS+=                configure.c client.c
 SRCS+=         ${SRC_IF} ${SRC_PF}
 
 LIBEXECDIR=    ${PREFIX}/libexec
-SCRIPT=                ${LIBEXECDIR}/dhcpcd.sh
-HOOKDIR=       ${LIBEXECDIR}/dhcpcd.hook.d
+SCRIPT=                ${LIBEXECDIR}/dhcpcd-run-hooks
+HOOKDIR=       ${LIBEXECDIR}/dhcpcd-hooks
 
 BINDIR=                ${PREFIX}/sbin
 DBDIR=         /var/db
 SYSCONFDIR?=   ${PREFIX}/etc
 
-MAN=           dhcpcd.conf.5 dhcpcd.8 dhcpcd.sh.8
-CLEANFILES=    dhcpcd.conf.5 dhcpcd.8 dhcpcd.sh.8
+MAN=           dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8
+CLEANFILES=    dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8
 
-SCRIPTS=       dhcpcd.sh
+SCRIPTS=       dhcpcd-run-hooks
 SCRIPTSDIR=    ${LIBEXECDIR}
-CLEANFILES+=   dhcpcd.sh
+CLEANFILES+=   dhcpcd-run-hooks
 
 FILES=         dhcpcd.conf
 FILESDIR=      ${SYSCONFDIR}

diff --git a/config.h b/config.h
index 3ec2aab38b28f7dc0945c03914358e9d1d8ad308..9a7b3999eee24350ca832e72adfd4580b95fb83b 100644 (file)
--- a/config.h
+++ b/config.h
@@ -77,7 +77,7 @@
 # define CONFIG                        SYSCONFDIR "/" PACKAGE ".conf"
 #endif
 #ifndef SCRIPT
-# define SCRIPT                        LIBEXECDIR "/" PACKAGE ".sh"
+# define SCRIPT                        LIBEXECDIR "/" PACKAGE "-run-hooks"
 #endif
 #ifndef DUID
 # define DUID                  SYSCONFDIR "/" PACKAGE ".duid"

diff --git a/hook.d/01-test.sh b/dhcpcd-hooks/01-test
similarity index 100%
rename from hook.d/01-test.sh
rename to dhcpcd-hooks/01-test

diff --git a/hook.d/10-resolv.conf.sh b/dhcpcd-hooks/10-resolv.conf
similarity index 100%
rename from hook.d/10-resolv.conf.sh
rename to dhcpcd-hooks/10-resolv.conf

diff --git a/hook.d/14-lookup-hostname.sh b/dhcpcd-hooks/14-lookup-hostname
similarity index 100%
rename from hook.d/14-lookup-hostname.sh
rename to dhcpcd-hooks/14-lookup-hostname

diff --git a/hook.d/15-hostname.sh b/dhcpcd-hooks/15-hostname
similarity index 100%
rename from hook.d/15-hostname.sh
rename to dhcpcd-hooks/15-hostname

diff --git a/hook.d/50-dhcpcd-compat.sh b/dhcpcd-hooks/50-dhcpcd-compat.sh
similarity index 100%
rename from hook.d/50-dhcpcd-compat.sh
rename to dhcpcd-hooks/50-dhcpcd-compat.sh

diff --git a/hook.d/50-ntp.sh b/dhcpcd-hooks/50-ntp
similarity index 100%
rename from hook.d/50-ntp.sh
rename to dhcpcd-hooks/50-ntp

diff --git a/hook.d/50-ypbind.sh b/dhcpcd-hooks/50-ypbind
similarity index 100%
rename from hook.d/50-ypbind.sh
rename to dhcpcd-hooks/50-ypbind

diff --git a/hook.d/Makefile b/dhcpcd-hooks/Makefile
similarity index 100%
rename from hook.d/Makefile
rename to dhcpcd-hooks/Makefile

diff --git a/dhcpcd.sh.8.in b/dhcpcd-run-hooks.8.in
similarity index 99%
rename from dhcpcd.sh.8.in
rename to dhcpcd-run-hooks.8.in
index 903f0c4d9caaeff7a200a100a8da39995e98a9b7..a5452030d61101f17f43294bdaaf5c10ba64b3f0 100644 (file)
--- a/dhcpcd.sh.8.in
+++ b/dhcpcd-run-hooks.8.in
@@ -25,7 +25,7 @@
 .Dd May 21, 2008
 .Dt DHCPCD.SH 8 SMM
 .Sh NAME
-.Nm dhcpcd.sh
+.Nm dhcpcd-run-hooks
 .Nd DHCP client configuration script 
 .Sh DESCRIPTION
 .Nm

diff --git a/dhcpcd.sh.in b/dhcpcd-run-hooks.in
similarity index 100%
rename from dhcpcd.sh.in
rename to dhcpcd-run-hooks.in

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index ea3d6fac9e79c827d71eb7259411f296b3fc24d7..a95b9a45bb7bd420461adc040cda8dcc4c3a26b4 100644 (file)
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -120,7 +120,7 @@ You can disable each script by using the
 .Fl C , -nohook
 option.
 See
-.Xr dhcpcd.sh 8
+.Xr dhcpcd-run-hooks 8
 for details on how these scripts work.
 .Nm
 currently ignores the exit code of the script.
@@ -304,7 +304,7 @@ The interface configuration isn't touched and neither are any configuration
 files.
 .It Fl V, -variables
 Display a list of option codes and the associated variable for use in
-.Xr dhcpcd.sh 8 .
+.Xr dhcpcd-run-hooks 8 .
 .El
 .Sh NOTES
 .Nm
@@ -330,7 +330,7 @@ lease and use the files mtime as when it was issued.
 .El
 .Sh SEE ALSO
 .Xr dhcpcd.conf 5 ,
-.Xr dhcpcd.sh 8 ,
+.Xr dhcpcd-run-hooks 8 ,
 .Xr resolv.conf 5 ,
 .Xr resolvconf 8 ,
 .Sh STANDARDS

diff --git a/dhcpcd.conf b/dhcpcd.conf
index 17832540ea3c93b0e6d85608ee3fef6ed32e6754..240c4f7626c3502d2d6522f27e716622a7c935d4 100644 (file)
--- a/dhcpcd.conf
+++ b/dhcpcd.conf
@@ -1,7 +1,7 @@
 # A sample configuration for dhcpcd.
 # See dhcpcd.conf(5) for details.
 
-# dhcpcd.sh uses these options.
+# dhcpcd-run-hooks uses these options.
 option domain_name_servers, domain_name, domain_search, host_name
 
 # Most distros have ntp support.

diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index bedafcd7ef83f2edc6f3ee17f399da0635a1c42d..d7ecfd7c6ff9ca6ee6bef96424f9748345160c06 100644 (file)
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -101,7 +101,7 @@ Requests the
 .Ar dhcp-option
 from the server.
 It can be a variable to be used in
-.Xr dhcpcd.sh 8
+.Xr dhcpcd-run-hooks 8
 or the numerical value.
 You can specify more seperated by commas, spaces or more option lines.
 .It Ic script Ar script
@@ -117,7 +117,7 @@ Tag the DHCP messages with the userclass.
 You can specify more than one.
 .El
 .Sh SEE ALSO
-.Xr dhcpcd.sh 8 ,
+.Xr dhcpcd-run-hooks 8 ,
 .Xr dhcpcd 8
 .Sh AUTHORS
 .An Roy Marples <roy@marples.name>