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 16a61778633c7924fd60bb6f1fd7d51b717fe4ef (commit) from f824c939b9e23597a706fcaa328876b76e391f82 (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 16a61778633c7924fd60bb6f1fd7d51b717fe4ef Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Aug 1 12:02:10 2010 +0200

dnsmasq: Make command line customizeable.

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

Summary of changes: src/initscripts/init.d/dnsmasq | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)

Difference in files: diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index 0dfb1f4..1185921 100644 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@ -15,6 +15,11 @@ . /etc/sysconfig/rc . ${rc_functions}

+# Pull custom configuration file +if [ -e "/etc/sysconfig/dnsmasq" ]; then + . /etc/sysconfig/dnsmasq +fi + SHOW_SRV=1

case "${1}" in @@ -41,7 +46,8 @@ case "${1}" in [ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf" ARGS="$ARGS --domain=`cat /var/ipfire/main/settings |grep DOMAIN |cut -d = -f 2`" - + ARGS="$ARGS $CUSTOM_ARGS" + loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then

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