[gentoo-commits] gentoo-x86 commit in net-dns/openresolv/files: openresolv-3.3-dnsmasq-dbus_pid.patch

[Jim Ramsay (lack)]

lack        09/04/30 15:30:56

  Added:                openresolv-3.3-dnsmasq-dbus_pid.patch
  Log:
  Fixed dbus detection bug for dnsmasq script
  (Portage version: 2.1.6.11/cvs/Linux i686)

Revision  Changes    Path
1.1                  net-dns/openresolv/files/openresolv-3.3-dnsmasq-dbus_pid.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/openresolv/files/openresolv-3.3-dnsmasq-dbus_pid.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/openresolv/files/openresolv-3.3-dnsmasq-dbus_pid.patch?rev=1.1&content-type=text/plain

Index: openresolv-3.3-dnsmasq-dbus_pid.patch
===================================================================
From 580cc04369dcb19a6a48ff67371e9fd292781066 Mon Sep 17 00:00:00 2001
From: Jim Ramsay <lack@g.o>
Date: Thu, 30 Apr 2009 15:59:58 +0100
Subject: [PATCH] Fix dnsmasq finding the right pidfile.

---
 dnsmasq.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dnsmasq.in b/dnsmasq.in
index 8fdd999..09120d1 100644
--- a/dnsmasq.in
+++ b/dnsmasq.in
@@ -43,8 +43,8 @@ newresolv="$newconf"
 # Check for DBus support in the binary
 dbus=false
 : ${dbus_pid:=/var/run/dbus/dbus.pid}
-[ -s "$dbus_pid" ] || dbuspid=/var/run/dbus.pid
-[ -s "$dbus_pid" ] || dbuspid=/var/run/dbus/pid
+[ -s "$dbus_pid" ] || dbus_pid=/var/run/dbus.pid
+[ -s "$dbus_pid" ] || dbus_pid=/var/run/dbus/pid
 if [ -s "$dbus_pid" -a -s "$dnsmasq_pid" ]; then
 	if dnsmasq --version 2>/dev/null | \
 		grep -q "^Compile time options.*[[:space:]]DBus[[:space:]]"
-- 
1.6.2