From 15e913230c652ace36abfbf2b6fed0c1f56b8711 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 17 Dec 2013 02:43:38 +0100
Subject: [PATCH] bus: install unit files for new driver service

---
 Makefile.am                          | 13 +++++++++++++
 src/bus-driverd/Makefile             |  1 +
 units/.gitignore                     |  1 +
 units/org.freedesktop.DBus.busname   | 12 ++++++++++++
 units/systemd-bus-driverd.service.in | 14 ++++++++++++++
 5 files changed, 41 insertions(+)
 create mode 120000 src/bus-driverd/Makefile
 create mode 100644 units/org.freedesktop.DBus.busname
 create mode 100644 units/systemd-bus-driverd.service.in

diff --git a/Makefile.am b/Makefile.am
index de63054ad..8bef21bda 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3728,8 +3728,21 @@ systemd_bus_driverd_LDADD = \
 
 rootlibexec_PROGRAMS += \
 	systemd-bus-driverd
+
+nodist_systemunit_DATA += \
+	units/systemd-bus-driverd.service
+
+dist_systemunit_DATA += \
+	units/org.freedesktop.DBus.busname
+
+BUSNAMES_TARGET_WANTS += \
+	org.freedesktop.DBus.busname
+
 endif
 
+EXTRA_DIST += \
+	units/systemd-bus-driverd.service.in
+
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
diff --git a/src/bus-driverd/Makefile b/src/bus-driverd/Makefile
new file mode 120000
index 000000000..d0b0e8e00
--- /dev/null
+++ b/src/bus-driverd/Makefile
@@ -0,0 +1 @@
+../Makefile
\ No newline at end of file
diff --git a/units/.gitignore b/units/.gitignore
index 94876ed71..76c4cb39e 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -22,6 +22,7 @@
 /systemd-ask-password-wall.service
 /systemd-backlight@.service
 /systemd-binfmt.service
+/systemd-bus-driverd.service
 /systemd-bus-proxyd@.service
 /systemd-fsck-root.service
 /systemd-fsck@.service
diff --git a/units/org.freedesktop.DBus.busname b/units/org.freedesktop.DBus.busname
new file mode 100644
index 000000000..68c649d96
--- /dev/null
+++ b/units/org.freedesktop.DBus.busname
@@ -0,0 +1,12 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Bus Driver Service Bus Name
+
+[BusName]
+Service=systemd-bus-driverd.service
diff --git a/units/systemd-bus-driverd.service.in b/units/systemd-bus-driverd.service.in
new file mode 100644
index 000000000..575bddc69
--- /dev/null
+++ b/units/systemd-bus-driverd.service.in
@@ -0,0 +1,14 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Bus Driver Service
+
+[Service]
+ExecStart=@rootlibexecdir@/systemd-bus-driverd
+BusName=org.freedesktop.DBus
+WatchdogSec=1min
-- 
2.30.2