summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorwchang kim <wchang.kim@samsung.com>2016-12-09 16:02:55 +0900
committerwchang kim <wchang.kim@samsung.com>2016-12-12 13:13:44 +0900
commit4d75e390f11c074529e93b4497c2fdc1320a2c4a (patch)
treeaa292f1130362b5cadfd366cbce7156c958e08e7 /packaging
parent1c4f78e6bd97a69d805f452ccb8aa0c38cb76cd3 (diff)
downloadsystem-plugin-4d75e390f11c074529e93b4497c2fdc1320a2c4a.tar.gz
system-plugin-4d75e390f11c074529e93b4497c2fdc1320a2c4a.tar.bz2
system-plugin-4d75e390f11c074529e93b4497c2fdc1320a2c4a.zip
Add the directory for system session and user session to share.submit/tizen_3.0/20161212.042035
Making the directory of /run/user_ext/<uid>. Mounting tmpfs to it with smackfstransmute System::Run. Unmounting directories which systemd_user_helper made when service is stopped. Change-Id: Ia749ba8ec291018c29216c65a0d47ee7ab385dbc Signed-off-by: Woochang Kim <wchang.kim@samsung.com>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/system-plugin.spec5
-rw-r--r--packaging/systemd-user-helper.manifest3
2 files changed, 7 insertions, 1 deletions
diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index fe80dd9..ec8a348 100644
--- a/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@ -320,9 +320,12 @@ mv %{_sysconfdir}/fstab_lazymnt %{_sysconfdir}/fstab
%posttrans -n systemd-user-helper
cp -a /usr/lib/systemd/system/user\@.service /usr/lib/systemd/system/__user@.service
/usr/bin/sed -i -e 's/Type=\(.*\)/Type=forking/' /usr/lib/systemd/system/user\@.service
-/usr/bin/sed -i -e 's/ExecStart=\(.*\)/ExecStart=\/usr\/bin\/systemd_user_helper %i/' /usr/lib/systemd/system/user\@.service
+/usr/bin/sed -i -e 's/ExecStart=\(.*\)/ExecStart=\/usr\/bin\/systemd_user_helper start %i/' /usr/lib/systemd/system/user\@.service
+/usr/bin/sed -i -e '/ExecStart=\(.*\)/ a ExecStop=\/usr\/bin\/systemd_user_helper stop %i' /usr/lib/systemd/system/user\@.service
/usr/bin/sed -i -e '/PIDFile=\(.*\)/d' /usr/lib/systemd/system/user\@.service
+/usr/bin/sed -i -e '/XDG_RUNTIME_DIR/ a Environment=XDG_RUNTIME_EXT_DIR=/run/user_ext/%i' /usr/lib/systemd/system/user\@.service
echo 'PIDFile=/run/user/%i/.systemd.pid' >> /usr/lib/systemd/system/user\@.service
+echo "d /run/user_ext 0755 root root -" >> /usr/lib/tmpfiles.d/systemd.conf
%files profile_ivi
%{_prefix}/lib/udev/rules.d/99-usb-ethernet.rules
diff --git a/packaging/systemd-user-helper.manifest b/packaging/systemd-user-helper.manifest
index 2a0cec5..bcde152 100644
--- a/packaging/systemd-user-helper.manifest
+++ b/packaging/systemd-user-helper.manifest
@@ -2,4 +2,7 @@
<request>
<domain name="_"/>
</request>
+ <assign>
+ <filesystem path="/usr/bin/systemd_user_helper" label="System::Privileged" exec_label="System::Privileged" />
+ </assign>
</manifest>