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 22ab0e0caee4613f0b821fc2e65e862c64e0a958 (commit) from 741648293bf66fe315983a9ff47810febf4173f1 (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 22ab0e0caee4613f0b821fc2e65e862c64e0a958 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jul 4 13:23:39 2014 +0200

core80: Ship dhcrelay.

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

Summary of changes: config/rootfiles/common/armv5tel/initscripts | 1 + config/rootfiles/common/dhcp | 2 +- config/rootfiles/common/i586/initscripts | 1 + config/rootfiles/core/80/filelists/files | 2 ++ src/initscripts/init.d/dhcrelay | 53 ++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+), 1 deletion(-) create mode 100755 src/initscripts/init.d/dhcrelay

Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 5d5c692..1ec9ed4 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -24,6 +24,7 @@ etc/rc.d/init.d/console #etc/rc.d/init.d/cyrus-imapd #etc/rc.d/init.d/cyrus-sasl etc/rc.d/init.d/dhcp +etc/rc.d/init.d/dhcrelay etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/fcron #etc/rc.d/init.d/fetchmail diff --git a/config/rootfiles/common/dhcp b/config/rootfiles/common/dhcp index 381309c..2c2cfee 100644 --- a/config/rootfiles/common/dhcp +++ b/config/rootfiles/common/dhcp @@ -21,7 +21,7 @@ etc/dhcp/dhcpd.conf #usr/lib/libomapi.a #usr/sbin/dhclient usr/sbin/dhcpd -#usr/sbin/dhcrelay +usr/sbin/dhcrelay #usr/share/man/man1/omshell.1 #usr/share/man/man3/dhcpctl.3 #usr/share/man/man3/omapi.3 diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index fa3dbcd..153a5f4 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -26,6 +26,7 @@ etc/rc.d/init.d/console #etc/rc.d/init.d/cyrus-imapd #etc/rc.d/init.d/cyrus-sasl etc/rc.d/init.d/dhcp +etc/rc.d/init.d/dhcrelay etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/fcron #etc/rc.d/init.d/fetchmail diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files index d5eb6c9..4d242b6 100644 --- a/config/rootfiles/core/80/filelists/files +++ b/config/rootfiles/core/80/filelists/files @@ -1,5 +1,7 @@ etc/system-release etc/issue +etc/rc.d/init.d/dhcrelay usr/local/bin/setddns.pl +usr/sbin/dhcrelay var/ipfire/general-functions.pl var/ipfire/langs diff --git a/src/initscripts/init.d/dhcrelay b/src/initscripts/init.d/dhcrelay new file mode 100755 index 0000000..327a084 --- /dev/null +++ b/src/initscripts/init.d/dhcrelay @@ -0,0 +1,53 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/dhcrelay +# +# Description : The DHCP Relay Daemon +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +CONFIG_FILE="/var/ipfire/dhcp/relay" + +if [ -r "${CONFIG_FILE}" ]; then + eval $(/usr/local/bin/readhash ${CONFIG_FILE}) +fi + +ARGS="-q" + +for interface in ${INTERFACES}; do + ARGS="${ARGS} -i ${interface}" +done + +ARGS="${ARGS} ${SERVERS}" + +case "${1}" in + start) + boot_mesg "Starting DHCP Relay..." + loadproc /usr/sbin/dhcrelay ${ARGS} + ;; + + stop) + boot_mesg "Stopping DHCP Relay..." + killproc -p /var/run/dhcrelay.pid /usr/sbin/dhcrelay + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc /usr/sbin/dhcrelay + ;; + + *) + echo "Usage: ${0} {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/dhcrelay

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