Remove RC_SVCNAME.

We've not used that for quite a while now.....

diff --git a/BUILDING.md b/BUILDING.md
index 20157b7617a293880b2fbad72cbcecde6b985acf..7e1f71505e5a2e139a6fb7697446716b4df4bf9b 100644 (file)
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -170,17 +170,3 @@ If running privilege separation and on Linux then the `00-linux` hook is
 **mandatory**.
 If you choose not to run it, then you are responsible for setting up the
 needed mount points: `/dev`, `/proc`, `/sys`, `/run/udev`
-
-Some system services expose the name of the service we are in,
-by default dhcpcd will pick `RC_SVCNAME` from the environment.
-You can override this in `CPPFLAGS+= -DRC_SVCNAME="YOUR_SVCNAME"`.
-This is important because dhcpcd will scrub the environment aside from `$PATH`
-before running hooks.
-This variable could be used to facilitate service re-entry so this chain could
-happen in a custom OS hook:
-  dhcpcd service marked inactive && dhcpcd service starts
-  dependant services are not started because dhcpcd is inactive (not stopped)
-  dhcpcd hook tests if `$if_up = true` and `$af_waiting` is empty or unset.
-  if true, mark the dhcpcd service as started and then start dependencies
-  if false and the dhcpcd service was previously started, mark as inactive and
-     stop any dependant services.

diff --git a/hooks/dhcpcd-run-hooks.8.in b/hooks/dhcpcd-run-hooks.8.in
index 7cf17ed11199af2ed30e13004bb2bad7a8cbaf07..c401afe8f12bd5ff69ffd41680e0b65c9bf4b475 100644 (file)
--- a/hooks/dhcpcd-run-hooks.8.in
+++ b/hooks/dhcpcd-run-hooks.8.in
@@ -147,9 +147,7 @@ script to process them.
 .Sh ENVIRONMENT
 .Nm dhcpcd
 will clear the environment variables aside from
-.Ev $PATH
-and
-.Ev $RC_SVCNAME .
+.Ev $PATH .
 The following variables will then be set, along with any protocol supplied
 ones.
 .Bl -tag -width xnew_delegated_dhcp6_prefix

diff --git a/src/script.c b/src/script.c
index d919333a85a9062ef9a3c8115d67d66e6c19f66e..6189a4c1c63fb80fa71d155a41391021e19476c3 100644 (file)
--- a/src/script.c
+++ b/src/script.c
@@ -57,11 +57,6 @@
 #include "privsep.h"
 #include "script.h"
 
-/* Allow the OS to define another script env var name */
-#ifndef RC_SVCNAME
-#define RC_SVCNAME "RC_SVCNAME"
-#endif
-
 #define DEFAULT_PATH   "/usr/bin:/usr/sbin:/bin:/sbin"
 
 static const char * const if_params[] = {