68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
|
|
--- dnsmasq-2.30/rpm/dnsmasq.rh 2006-05-02 09:35:27.000000000 -0500
|
|
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 09:48:47.000000000 -0500
|
|
@@ -2,7 +2,7 @@
|
|
#
|
|
# Startup script for the DNS caching server
|
|
#
|
|
-# chkconfig: 2345 99 01
|
|
+# chkconfig: - 99 01
|
|
# description: This script starts your DNS caching server
|
|
# processname: dnsmasq
|
|
# pidfile: /var/run/dnsmasq.pid
|
|
@@ -19,19 +19,10 @@
|
|
dnsmasq=/usr/sbin/dnsmasq
|
|
[ -f $dnsmasq ] || exit 0
|
|
|
|
-# change this line if you want dnsmasq to serve an MX record for
|
|
-# the host it is running on.
|
|
-MAILHOSTNAME=""
|
|
-# change this line if you want dns to get its upstream servers from
|
|
-# somewhere other that /etc/resolv.conf
|
|
-RESOLV_CONF=""
|
|
-# change this if you want dnsmasq to cache any "hostname" or "client-hostname" from
|
|
-# a dhcpd's lease file
|
|
-DHCP_LEASE="/var/lib/dhcp/dhcpd.leases"
|
|
-DOMAIN_SUFFIX=`dnsdomainname`
|
|
-
|
|
-OPTIONS=""
|
|
+# source /etc/sysconfig/dnsmasq if it exists
|
|
+[ -f /etc/sysconfig/dnsmasq ] && . /etc/sysconfig/dnsmasq
|
|
|
|
+# apply options from /etc/sysconfig/dnsmasq if they're set
|
|
if [ ! -z "${MAILHOSTNAME}" ]; then
|
|
OPTIONS="$OPTIONS -m $MAILHOSTNAME"
|
|
fi
|
|
@@ -72,7 +63,13 @@
|
|
status dnsmasq
|
|
RETVAL=$?
|
|
;;
|
|
- restart|reload)
|
|
+ reload)
|
|
+ echo -n "Reloading dnsmasq: "
|
|
+ killproc dnsmasq -HUP
|
|
+ RETVAL=$?
|
|
+ echo
|
|
+ ;;
|
|
+ restart)
|
|
$0 stop
|
|
$0 start
|
|
RETVAL=$?
|
|
diff -urN dnsmasq-2.30/rpm/dnsmasq.sysconfig dnsmasq-2.30-patched/rpm/dnsmasq.sysconfig
|
|
--- dnsmasq-2.30/rpm/dnsmasq.sysconfig 1969-12-31 18:00:00.000000000 -0600
|
|
+++ dnsmasq-2.30-patched/rpm/dnsmasq.sysconfig 2006-05-02 09:49:42.000000000 -0500
|
|
@@ -0,0 +1,13 @@
|
|
+# change this line if you want dnsmasq to serve an MX record for
|
|
+# the host it is running on.
|
|
+MAILHOSTNAME=""
|
|
+# change this line if you want dns to get its upstream servers from
|
|
+# somewhere other that /etc/resolv.conf
|
|
+RESOLV_CONF=""
|
|
+# change this if you want dnsmasq to cache any "hostname" or "client-hostname"
|
|
+# from a dhcpd's lease file
|
|
+# (deprecated!)
|
|
+#DHCP_LEASE="/var/lib/dhcp/dhcpd.leases"
|
|
+DOMAIN_SUFFIX=`dnsdomainname`
|
|
+# other options?
|
|
+OPTIONS=""
|