From 0eccedd1c8340e186a8329f66a235aea6c92b1af Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 26 Feb 2018 11:12:20 +0000 Subject: [PATCH] dhcp: Allow adding extra DHCP interfaces Signed-off-by: Michael Tremer --- config/rootfiles/core/120/filelists/files | 1 + src/initscripts/system/dhcp | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/core/120/filelists/files b/config/rootfiles/core/120/filelists/files index 9369453596..57475b1679 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 2ae86db314..d98229564d 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 -- 2.39.2