Use cat instead of grep for listing our resolvconfs

[openresolv] / dnsmasq

diff --git a/dnsmasq b/dnsmasq
index e2fcecdfcbd70dfb31baceb37589f14dcef5456a..8b104eca02ab00679f0dafe5db65bf4c095e9611 100755 (executable)
--- a/dnsmasq
+++ b/dnsmasq
@@ -51,7 +51,7 @@
 VARS="$(resolvconf -v)"
 eval "${VARS}"
 
-PREFIX=/
+PREFIX=
 DNSMASQRESOLV="${PREFIX}/etc/dnsmasq-resolv.conf"
 DNSMASQCONF="${PREFIX}/etc/dnsmasq-resolvconf.conf"
 
@@ -149,22 +149,9 @@ else
        printf "${NEWRESOLV}" > "${DNSMASQRESOLV}"
 fi
 
-if [ "${RELOAD}" = "yes" ]; then
-       if [ -x "${PREFIX}"/etc/init.d/dnsmasq ]; then
-               /etc/init.d/dnsmasq --quiet --nodeps conditionalrestart
-       elif [ -x "${PREFIX}"/etc/rc.d/dnsmasq ]; then
-               "${PREFIX}"/etc/rc.d/dnsmasq restart
-       fi
-fi
-
+[ "${RELOAD}" = "yes" ] && resolvconf -s dnsmasq restart
 if [ "${DBUS}" = "yes" ]; then
-       if [ "${RELOAD}" != "yes" ]; then
-               if [ -x "${PREFIX}"/etc/init.d/dnsmasq ]; then
-                       /etc/init.d/dnsmasq --quiet reload
-               elif [ -x "${PREFIX}"/etc/rc.d/dnsmasq ]; then
-                       "${PREFIX}"/etc/rc.d/dnsmasq reload
-               fi
-       fi
+       [ "${RELOAD}" != "yes" ] && resolvconf -s dnsmasq reload
        # Send even if emtpy so old servers are cleared
        dbus-send --system --dest=uk.org.thekelleys.dnsmasq \
                /uk/org/thekelleys/dnsmasq uk.org.thekelleys.SetServers \