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, master has been updated via 838925a6247dd28c73c2b585fff24797e1068531 (commit) from d70366de89c189206fe77ee780b9dd61d0c508d6 (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 838925a6247dd28c73c2b585fff24797e1068531 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 1 19:48:00 2014 +0200
dhcp: Check if GREEN_DEV and BLUE_DEV are actually set.
-----------------------------------------------------------------------
Summary of changes: src/initscripts/init.d/dhcp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Difference in files: diff --git a/src/initscripts/init.d/dhcp b/src/initscripts/init.d/dhcp index bc0abce..083a555 100644 --- a/src/initscripts/init.d/dhcp +++ b/src/initscripts/init.d/dhcp @@ -20,13 +20,13 @@ case "$1" in start) flush_chains
- if [ -e /var/ipfire/dhcp/enable_green ]; then + if [ -n "${GREEN_DEV}" -a -e "/var/ipfire/dhcp/enable_green" ]; then devices="${GREEN_DEV}"
iptables -A DHCPGREENINPUT -i "${GREEN_DEV}" -j DHCPINPUT iptables -A DHCPGREENOUTPUT -o "${GREEN_DEV}" -j DHCPOUTPUT fi - if [ -e /var/ipfire/dhcp/enable_blue ]; then + if [ -n "${BLUE_DEV}" -a -e "/var/ipfire/dhcp/enable_blue" ]; then devices+=" ${BLUE_DEV}"
iptables -A DHCPBLUEINPUT -i "${BLUE_DEV}" -j DHCPINPUT @@ -35,7 +35,7 @@ case "$1" in
boot_mesg "Starting DHCP Server..." loadproc /usr/sbin/dhcpd -q ${devices} - + (sleep 5 && chmod 644 /var/run/dhcpd.pid) & # Fix because silly dhcpd creates its pid with mode 640 ;;
hooks/post-receive -- IPFire 2.x development tree