From: Mateusz Moscicki <m.moscicki2@partner.samsung.com>
Date: Fri, 19 Apr 2019 10:36:54 +0000 (+0200)
Subject: tizen: Add additional unit for "unified" user session
X-Git-Tag: submit/tizen/20190430.135939^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F31%2F204131%2F1;p=platform%2Fcore%2Fcontext%2Fcontext-service.git

tizen: Add additional unit for "unified" user session

The unified user session is about moving user session units, managed by
systemd --user, to main systemd, where it's managed as part of newly
created user@.target.

user@.target will contain same units as previously available in user/,
with same UID and environment setup.  systemd instance is used for unit
to be able to specify UID (inherited from user@.target).

The rationale behind this work is following:

* VD requirement to remove user session support
* boot time optimization requirements, due to:

   + 'systemd --user' taking 1s its own startup that could be used for
     unit startup
   + ability to better rearrange units if these managed by one systemd
     instance

Unit installed by this commit will not be used till user login mechanism
will be changed in systemd package (via changing pam_systemd to start
user@.target, rather than user@.service).

Change-Id: I753079a8eb9e4b8d340850b2b601c46424819d13
---

diff --git a/packaging/context-service.spec b/packaging/context-service.spec
index 24de18a..454707b 100644
--- a/packaging/context-service.spec
+++ b/packaging/context-service.spec
@@ -9,6 +9,8 @@ Source1:	contextd.service
 Source2:	org.tizen.context.conf
 Source3:	contextd-agent.service
 Source4:	contextd-agent.socket
+Source5:	contextd-agent@.service
+Source6:	contextd-agent@.socket
 
 %define upgrade_script_path /usr/share/upgrade/scripts
 
@@ -70,6 +72,11 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_unitdir_user}
 install -m 0644 %{SOURCE4} %{buildroot}%{_unitdir_user}
 ln -s ../contextd-agent.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/contextd-agent.socket
 
+mkdir -p %{buildroot}%{_unitdir}/user-sockets@.target.wants
+install -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}
+install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}
+ln -s ../contextd-agent@.socket %{buildroot}%{_unitdir}/user-sockets@.target.wants/contextd-agent@.socket
+
 mkdir -p %{buildroot}%{upgrade_script_path}
 cp -f scripts/500.context-service.sh %{buildroot}%{upgrade_script_path}
 
@@ -88,4 +95,7 @@ cp -f scripts/500.context-service.sh %{buildroot}%{upgrade_script_path}
 %{_unitdir_user}/contextd-agent.service
 %{_unitdir_user}/contextd-agent.socket
 %{_unitdir_user}/*/contextd-agent.socket
+%{_unitdir}/contextd-agent@.service
+%{_unitdir}/contextd-agent@.socket
+%{_unitdir}/*/contextd-agent@.socket
 %license LICENSE
diff --git a/packaging/contextd-agent@.service b/packaging/contextd-agent@.service
new file mode 100644
index 0000000..afce41f
--- /dev/null
+++ b/packaging/contextd-agent@.service
@@ -0,0 +1,16 @@
+[Unit]
+PartOf=userlogin@%i.target
+Description=Contextual Service Framework User-Level Agent Daemon
+
+[Service]
+User=%i
+Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/sys/fs/kdbus/%i-user/bus;unix:path=/run/user/%i/bus
+Environment=XDG_RUNTIME_DIR=/run/user/%i
+SmackProcessLabel=User
+Type=notify
+ExecStart=/usr/bin/contextd-agent
+Sockets=contextd-agent@%i.socket
+Restart=no
+
+[Install]
+WantedBy=user-sockets@.target
diff --git a/packaging/contextd-agent@.socket b/packaging/contextd-agent@.socket
new file mode 100644
index 0000000..e5518f5
--- /dev/null
+++ b/packaging/contextd-agent@.socket
@@ -0,0 +1,11 @@
+[Unit]
+PartOf=userlogin@%i.target
+DefaultDependencies=no
+After=systemd-logind.service
+Description=Context-Agent Socket
+
+[Socket]
+SocketUser=%i
+ListenStream=/run/user/%i/system_share/.contextd-agent.socket
+Service=contextd-agent@%i.service
+Accept=false