Merge "tizen: Add additional unit for "unified" user session" into tizen

3 files changed, 53 insertions, 0 deletions

diff --git a/packaging/launchpad-process-pool@.service b/packaging/launchpad-process-pool@.service
new file mode 100644
index 0000000..ecc41d3
--- /dev/null
+++ b/packaging/launchpad-process-pool@.service
@@ -0,0 +1,28 @@
+#
+#  Systemd script to Launch AMD Session agent
+#
+
+[Unit]
+PartOf=userlogin@%i.target
+Description=Start the USER Access Control Agent
+DefaultDependencies=false
+Requires=enlightenment-user@%i.service
+After=enlightenment-user@%i.service
+
+[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
+Capabilities=cap_sys_admin,cap_mac_admin,cap_setgid,cap_dac_override=i
+SecureBits=keep-caps
+ExecStartPre=-/usr/bin/mkdir -p /run/aul/daemons/%i
+ExecStartPre=-/usr/bin/chmod 0777 /run/aul/daemons/%i
+ExecStartPre=-/usr/bin/mkdir -p /run/aul/apps/%i
+ExecStartPre=-/usr/bin/chmod 0700 /run/aul/apps/%i
+ExecStartPre=-/usr/bin/mkdir -p /run/aul/dbspace/%i
+ExecStartPre=-/usr/bin/chmod 0701 /run/aul/dbspace/%i
+ExecStartPre=-/usr/bin/mkdir -p /run/aul/log/widget/%i
+ExecStartPre=-/usr/bin/chmod 0777 /run/aul/log/widget/%i
+ExecStart=/bin/sh -l -c "/usr/bin/launchpad-process-pool"
+Sockets=launchpad-process-pool@%i.socket
diff --git a/packaging/launchpad-process-pool@.socket b/packaging/launchpad-process-pool@.socket
new file mode 100644
index 0000000..c408ac3
--- /dev/null
+++ b/packaging/launchpad-process-pool@.socket
@@ -0,0 +1,12 @@
+[Unit]
+PartOf=userlogin@%i.target
+DefaultDependencies=no
+After=systemd-logind.service
+[Socket]
+SocketUser=%i
+ListenStream=/run/aul/daemons/%i/.launchpad-process-pool-sock
+DirectoryMode=0777
+Service=launchpad-process-pool@%i.service
+
+[Install]
+WantedBy=user-sockets@.target
diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec
index 60dde33..50382e9 100644
--- a/packaging/launchpad.spec
+++ b/packaging/launchpad.spec
@@ -7,6 +7,8 @@ License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source101:  launchpad-process-pool.service
 Source102:  launchpad-process-pool.socket
+Source201:  launchpad-process-pool@.service
+Source202:  launchpad-process-pool@.socket
 
 
 BuildRequires:  cmake
@@ -115,6 +117,13 @@ install -m 0644 %SOURCE102 %{buildroot}%{_unitdir_user}/launchpad-process-pool.s
 ln -sf ../launchpad-process-pool.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/launchpad-process-pool.socket
 ln -sf ../launchpad-process-pool.service %{buildroot}%{_unitdir_user}/basic.target.wants/launchpad-process-pool.service
 
+mkdir -p %{buildroot}%{_unitdir}/user-basic@.target.wants
+mkdir -p %{buildroot}%{_unitdir}/user-sockets@.target.wants
+install -m 0644 %SOURCE201 %{buildroot}%{_unitdir}/launchpad-process-pool@.service
+install -m 0644 %SOURCE202 %{buildroot}%{_unitdir}/launchpad-process-pool@.socket
+ln -sf ../launchpad-process-pool@.socket %{buildroot}%{_unitdir}/user-sockets@.target.wants/launchpad-process-pool@.socket
+ln -sf ../launchpad-process-pool@.service %{buildroot}%{_unitdir}/user-basic@.target.wants/launchpad-process-pool@.service
+
 %post
 
 %files
@@ -125,6 +134,10 @@ ln -sf ../launchpad-process-pool.service %{buildroot}%{_unitdir_user}/basic.targ
 %{_unitdir_user}/launchpad-process-pool.socket
 %{_unitdir_user}/sockets.target.wants/launchpad-process-pool.socket
 %{_unitdir_user}/basic.target.wants/launchpad-process-pool.service
+%{_unitdir}/launchpad-process-pool@.service
+%{_unitdir}/launchpad-process-pool@.socket
+%{_unitdir}/user-sockets@.target.wants/launchpad-process-pool@.socket
+%{_unitdir}/user-basic@.target.wants/launchpad-process-pool@.service
 %{_bindir}/launchpad-process-pool
 
 %files devel