diff --git a/dnsmasq.changes b/dnsmasq.changes index ae1033b..75d9696 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jan 19 04:22:44 UTC 2012 - crrodriguez@opensuse.org + +- --enable-dbus must be explicit in systemd unit +- default user is provided in config file or takes defaults on + group_and_isc.diff + +------------------------------------------------------------------- +Wed Jan 18 21:34:25 UTC 2012 - crrodriguez@opensuse.org + +- dnsmasq has dbus support, use it for systemd service. + ------------------------------------------------------------------- Fri Nov 25 13:14:41 CET 2011 - ug@suse.de diff --git a/dnsmasq.service b/dnsmasq.service index 1a441d0..137df60 100644 --- a/dnsmasq.service +++ b/dnsmasq.service @@ -3,9 +3,11 @@ Description=DNS caching server. After=syslog.target network.target [Service] -Type=forking -PIDFile=/var/run/dnsmasq.pid -ExecStart=/usr/sbin/dnsmasq -u dnsmasq +Type=dbus +BusName=uk.org.thekelleys.dnsmasq +ExecStartPre=/usr/sbin/dnsmasq --test +ExecStart=/usr/sbin/dnsmasq --enable-dbus --keep-in-foreground +ExecReload=/bin/kill -HUP $MAINPID [Install] WantedBy=multi-user.target diff --git a/dnsmasq.spec b/dnsmasq.spec index 99d5dd3..b2b07ad 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -1,7 +1,7 @@ # # spec file for package dnsmasq # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed