summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyotaek Shim <hyotaek.shim@samsung.com>2019-08-20 09:03:49 +0000
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>2019-08-20 09:03:49 +0000
commit4384e9b7feabd7cdaef89cf18f94a5b443ce7e08 (patch)
treef73881540e99712daf81656eca457c27f3ba8bef
parent42f5ba66b33ecb7b5ad460ee4dfd5d957be6ae36 (diff)
parent3ad3d47e655303e0824e4ce0098486599e8a5c7f (diff)
downloadsystem-plugin-4384e9b7feabd7cdaef89cf18f94a5b443ce7e08.tar.gz
system-plugin-4384e9b7feabd7cdaef89cf18f94a5b443ce7e08.tar.bz2
system-plugin-4384e9b7feabd7cdaef89cf18f94a5b443ce7e08.zip
Merge "Revert "tizen: Add additional unit for "unified" user session"" into tizensubmit/tizen/20190820.090809accepted/tizen/unified/20190822.045503
-rw-r--r--packaging/system-plugin.spec6
-rw-r--r--units/session-bind@.service16
2 files changed, 0 insertions, 22 deletions
diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index e30ef48..0609648 100644
--- a/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@ -231,10 +231,6 @@ mkdir -p %{buildroot}%{_userunitdir}/basic.target.wants
install -m 644 units/session-bind.service %{buildroot}%{_userunitdir}
ln -s ../session-bind.service %{buildroot}%{_userunitdir}/basic.target.wants/session-bind.service
-mkdir -p %{buildroot}%{_unitdir}/user-basic@.target.wants
-install -m 644 units/session-bind@.service %{buildroot}%{_unitdir}
-ln -s ../session-bind@.service %{buildroot}%{_unitdir}/user-basic@.target.wants/session-bind@.service
-
%clean
rm -rf %{buildroot}
@@ -336,8 +332,6 @@ rm -f %{_sbindir}/e4crypt
%{_bindir}/session-bind
%{_userunitdir}/session-bind.service
%{_userunitdir}/basic.target.wants/session-bind.service
-%{_unitdir}/session-bind@.service
-%{_unitdir}/user-basic@.target.wants/session-bind@.service
%post feature-session-bind
echo ""
diff --git a/units/session-bind@.service b/units/session-bind@.service
deleted file mode 100644
index bb3e805..0000000
--- a/units/session-bind@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=User session bind mount for %i
-Wants=wait-mount@opt-usr.service
-After=wait-mount@opt-usr.service
-ConditionPathIsMountPoint=!/opt/usr/apps
-ConditionPathIsMountPoint=!/opt/usr/media
-
-[Service]
-User=%i
-SmackProcessLabel=User
-Capabilities=cap_sys_admin=i
-SecureBits=keep-caps
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/session-bind