Annotation of embedaddon/dnsmasq/contrib/systemd/dbus_activation, revision 1.1.1.1

1.1       misho       1: To: dnsmasq-discuss@lists.thekelleys.org.uk
                      2: From: Alex Elsayed <eternaleye+usenet@gmail.com>
                      3: Date: Tue, 15 May 2012 01:53:54 -0700
                      4: Subject: [Dnsmasq-discuss] [PATCH] Support dbus activation
                      5: 
                      6: Introduce dbus service file and turn dbus on in the systemd
                      7: unit.
                      8: 
                      9: Note to packagers:
                     10: To add support for dbus activation, you must install the dbus
                     11: service file (dbus/uk.org.thekelleys.dnsmasq.service) into
                     12: $DATADIR/dbus-1/system-services.
                     13: 
                     14: ---
                     15:  contrib/systemd/dnsmasq.service        |    2 +-
                     16:  dbus/uk.org.thekelleys.dnsmasq.service |    7 +++++++
                     17:  2 files changed, 8 insertions(+), 1 deletion(-)
                     18:  create mode 100644 dbus/uk.org.thekelleys.dnsmasq.service
                     19: 
                     20: diff --git a/contrib/systemd/dnsmasq.service 
                     21: b/contrib/systemd/dnsmasq.service
                     22: index a27fe6d..4a784d3 100644
                     23: --- a/contrib/systemd/dnsmasq.service
                     24: +++ b/contrib/systemd/dnsmasq.service
                     25: @@ -5,7 +5,7 @@ Description=A lightweight DHCP and caching DNS server
                     26:  Type=dbus
                     27:  BusName=uk.org.thekelleys.dnsmasq
                     28:  ExecStartPre=/usr/sbin/dnsmasq --test
                     29: -ExecStart=/usr/sbin/dnsmasq -k
                     30: +ExecStart=/usr/sbin/dnsmasq -k -1
                     31:  ExecReload=/bin/kill -HUP $MAINPID
                     32:  
                     33:  [Install]
                     34: diff --git a/dbus/uk.org.thekelleys.dnsmasq.service 
                     35: b/dbus/uk.org.thekelleys.dnsmasq.service
                     36: new file mode 100644
                     37: index 0000000..f5fe98d
                     38: --- /dev/null
                     39: +++ b/dbus/uk.org.thekelleys.dnsmasq.service
                     40: @@ -0,0 +1,7 @@
                     41: +[D-BUS Service]
                     42: +Name=uk.org.thekelleys.dnsmasq
                     43: +Exec=/usr/sbin/dnsmasq -k -1
                     44: +User=root
                     45: +SystemdService=dnsmasq.service
                     46: +
                     47: +
                     48: -- 
                     49: 1.7.10.2
                     50: 
                     51: 
                     52: 
                     53: _______________________________________________
                     54: Dnsmasq-discuss mailing list
                     55: Dnsmasq-discuss@lists.thekelleys.org.uk
                     56: http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss
                     57: 

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>