From 10c2f855e927bcfdaedbf93681f2734792f0675e Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Wed, 8 Jun 2016 22:27:31 -0400
Subject: Turn on socket activation for rest-dbus

Defer starting of rest-dbus until a client connects.

Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../common/recipes-phosphor/rest-dbus/files/rest-dbus.service     | 3 ---
 .../common/recipes-phosphor/rest-dbus/files/rest-dbus.socket      | 8 ++++++++
 meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb      | 5 +++--
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.socket

(limited to 'meta-phosphor')

diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
index 79a848a43..5ad582f4b 100644
--- a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
+++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
@@ -4,6 +4,3 @@ Description=DBUS introspecting REST server.
 [Service]
 Restart=always
 ExecStart=/usr/sbin/rest-dbus
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.socket b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.socket
new file mode 100644
index 000000000..89f99b8c3
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=DBUS introspecting REST server socket.
+
+[Socket]
+ListenStream=3000
+
+[Install]
+WantedBy=sockets.target
diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
index 7f990aaa3..afee21c5e 100644
--- a/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
+++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
@@ -16,11 +16,12 @@ RDEPENDS_${PN} += " \
         pyphosphor \
         "
 
+SYSTEMD_SERVICE_${PN} += "rest-dbus.service rest-dbus.socket"
+
 SRC_URI += " \
         git://github.com/openbmc/rest-dbus.git \
-        file://rest-dbus.service \
         "
 
-SRCREV = "64077101d9f2b6e51c897db82ffc0a399a34d15b"
+SRCREV = "5a65d2f605494d5c308171ba4fd1ab08d7b3a91d"
 
 S = "${WORKDIR}/git"
-- 
cgit v1.2.1