webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-16 22:13:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x

Browse Source
This commit is contained in:
Jan Paul Tuecking
2010-08-16 19:20:21 +02:00
parent 09e756f8f2 40228ef46f
commit d97b2de4a1
46 changed files with 6523 additions and 5156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/initscripts/init.d/dnsmasq
View File

@@ -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