From: Roy Marples <roy@marples.name>
Date: Sat, 24 May 2008 17:15:14 +0000 (+0000)
Subject: Move dhcpcd.sh to dhcpcd-run-hooks and remove .sh suffixes
X-Git-Tag: v4.0.2~341
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee4e620abbd8cf362c36047bea040c692bd9f282;p=thirdparty%2Fdhcpcd.git

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

diff --git a/Makefile b/Makefile
index 468f57ae..838cd9b5 100644
--- 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 3ec2aab3..9a7b3999 100644
--- 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 903f0c4d..a5452030 100644
--- 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 ea3d6fac..a95b9a45 100644
--- 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 17832540..240c4f76 100644
--- 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 bedafcd7..d7ecfd7c 100644
--- 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>