From d80a4b84515f1e8cfd42c01ef13e97f0c7242eb2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org>
Date: Tue, 17 Jun 2014 14:36:33 +0200
Subject: [PATCH] Partially revert "Add smack for dbus"
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This partially reverts commit cc3d12a944c1cb0a2cd5d0dc4442c2ae43c0c7c1:
* keep the option to support smack in dbus
* revert the deletion of user@.service

Bug-Tizen: BTY-7
Change-Id: Iab2f4a58a46dee598bf9122ece3d26955c44f438
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
---
 recipes-core/dbus/dbus_1.6.18.bbappend      |  1 +
 recipes-tizen/systemd/files/user@.service   | 19 +++++++++++++++++++
 recipes-tizen/systemd/systemd-extraconf.inc |  2 ++
 3 files changed, 22 insertions(+)
 create mode 100644 recipes-tizen/systemd/files/user@.service

diff --git a/recipes-core/dbus/dbus_1.6.18.bbappend b/recipes-core/dbus/dbus_1.6.18.bbappend
index a394bd7..02ef4c6 100644
--- a/recipes-core/dbus/dbus_1.6.18.bbappend
+++ b/recipes-core/dbus/dbus_1.6.18.bbappend
@@ -33,3 +33,4 @@ FILES_${PN} += "${systemd_unitdir}/user/dbus.service \
               "
 
 EXTRA_OECONF += " --enable-smack "
+
diff --git a/recipes-tizen/systemd/files/user@.service b/recipes-tizen/systemd/files/user@.service
new file mode 100644
index 0000000..52948fd
--- /dev/null
+++ b/recipes-tizen/systemd/files/user@.service
@@ -0,0 +1,19 @@
+#  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=User Manager for %I
+After=systemd-user-sessions.service
+
+[Service]
+User=%I
+PAMName=systemd-user
+Type=notify
+Environment=SHELL=%s
+ExecStart=-/usr/lib/systemd/systemd --user
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket
+Slice=user-%i.slice
diff --git a/recipes-tizen/systemd/systemd-extraconf.inc b/recipes-tizen/systemd/systemd-extraconf.inc
index 8d000d9..6632dad 100644
--- a/recipes-tizen/systemd/systemd-extraconf.inc
+++ b/recipes-tizen/systemd/systemd-extraconf.inc
@@ -1,4 +1,5 @@
 SRC_URI += "file://systemd-user \
+            file://user@.service \
            "
 
 systemd_files += "${sysconfdir}/*"
@@ -43,6 +44,7 @@ do_install_append() {
  rm ${D}${sysconfdir}/timezone
 
  install -m 0644 ${WORKDIR}/systemd-user ${D}${sysconfdir}/pam.d
+ install -m 0644 ${WORKDIR}/user@.service ${D}/usr/lib/systemd/system/
 }
 
 EXTRA_OECONF = " --disable-manpages \
-- 
2.7.4