From 0bc15867dad61c24769d635c31c8263695ed92c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Date: Sun, 25 Oct 2015 02:59:27 +0200 Subject: [PATCH] package/dhcp: make S80dhcp-relay read a file from /etc/default/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The S80dhcp-relay init script has configuration variables like INTERFACES whose contents have to be passed to the daemon. These variables are initialized as empty strings, but some of them are not allowed to be empty and there was no means of filling them apart from creating a root FS overlay to overwrite these scripts. This commit adds support for reading dhcrelay under /etc/default/ to set these configuration variables. [Thomas: adapt to patch only S80dhcp-relay, since S80dhcp-server has already been changed by previous commits.] Signed-off-by: Benoît Thébaudeau Signed-off-by: Thomas Petazzoni --- package/dhcp/S80dhcp-relay | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/dhcp/S80dhcp-relay b/package/dhcp/S80dhcp-relay index 5ee06c7133..0f383e6043 100755 --- a/package/dhcp/S80dhcp-relay +++ b/package/dhcp/S80dhcp-relay @@ -13,6 +13,10 @@ INTERFACES="" # Additional options that are passed to the DHCP relay daemon? OPTIONS="" +# Read configuration variable file if it is present +CFG_FILE="/etc/default/dhcrelay" +[ -r "${CFG_FILE}" ] && . "${CFG_FILE}" + # Sanity checks test -f /usr/sbin/dhcrelay || exit 0 test -n "$INTERFACES" || exit 0