[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0eccedd1c8340e186a8329f66a235aea6c92b1af

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0eccedd1c8340e186a8329f66a235aea6c92b1af

[git]

[-- Attachment #1: Type: text/plain, Size: 2908 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  0eccedd1c8340e186a8329f66a235aea6c92b1af (commit)
      from  39d11d265e4f1a41994d0adf85498f54c63ba7ab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0eccedd1c8340e186a8329f66a235aea6c92b1af
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Feb 26 11:12:20 2018 +0000

    dhcp: Allow adding extra DHCP interfaces
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/120/filelists/files | 1 +
 src/initscripts/system/dhcp               | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/120/filelists/files b/config/rootfiles/core/120/filelists/files
index 936945359..57475b167 100644
--- a/config/rootfiles/core/120/filelists/files
+++ b/config/rootfiles/core/120/filelists/files
@@ -1,6 +1,7 @@
 etc/system-release
 etc/issue
 etc/fcron.daily/openvpn-crl-updater
+etc/rc.d/init.d/dhcpd
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 var/ipfire/langs
 var/ipfire/ovpn/openssl/ovpn.cnf
diff --git a/src/initscripts/system/dhcp b/src/initscripts/system/dhcp
index 2ae86db31..d98229564 100644
--- a/src/initscripts/system/dhcp
+++ b/src/initscripts/system/dhcp
@@ -8,6 +8,8 @@
 . /etc/sysconfig/rc
 . $rc_functions
 
+[ -e "/etc/sysconfig/dhcpd" ] && . /etc/sysconfig/dhcpd
+
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/dhcp/settings)
 
@@ -23,20 +25,20 @@ case "$1" in
 		flush_chains
 
 		if [ -n "${GREEN_DEV}" -a -e "/var/ipfire/dhcp/enable_green" ]; then
-			devices="${GREEN_DEV}"
+			LISTEN_INTERFACES+=" ${GREEN_DEV}"
 
 			iptables -A DHCPGREENINPUT  -i "${GREEN_DEV}" -j DHCPINPUT
 			iptables -A DHCPGREENOUTPUT -o "${GREEN_DEV}" -j DHCPOUTPUT
 		fi
 		if [ -n "${BLUE_DEV}" -a -e "/var/ipfire/dhcp/enable_blue" ]; then
-			devices+=" ${BLUE_DEV}"
+			LISTEN_INTERFACES+=" ${BLUE_DEV}"
 
 			iptables -A DHCPBLUEINPUT  -i "${BLUE_DEV}" -j DHCPINPUT
 			iptables -A DHCPBLUEOUTPUT -o "${BLUE_DEV}" -j DHCPOUTPUT
 		fi
 
 		boot_mesg "Starting DHCP Server..."
-		loadproc /usr/sbin/dhcpd -q ${devices}
+		loadproc /usr/sbin/dhcpd -q ${LISTEN_INTERFACES}
 
 		# Start Unbound DHCP Lease Bridge unless RFC2136 is used
 		if [ "${DNS_UPDATE_ENABLED}" != on ]; then


hooks/post-receive
--
IPFire 2.x development tree