Revert "Support container user: skip running starter and scim in container."

This reverts commit 214fe03afdc77227df0878a2b8658830d74bfa2e.

Change-Id: I4380633bac15a1bf6ce56db43727773f989ff963

diff --git a/packaging/session-utils.spec b/packaging/session-utils.spec
index 872828858b2711e1d8aa0617e2ca7aed60163fdd..a509a5a1bba1a22eb4529fb332c5270b632ccbcb 100644 (file)
--- a/packaging/session-utils.spec
+++ b/packaging/session-utils.spec
@@ -37,14 +37,6 @@ ln -sf ../bind-user-contents.service %{buildroot}%{_userunitdir}/basic.target.wa
 install -m 644 units/container_postprocess.service %{buildroot}%{_userunitdir}/
 #ln -sf ../container_postprocess.service %{buildroot}%{_userunitdir}/basic.target.wants/container_postprocess.service
 
-# starter container plugin
-mkdir -p %{buildroot}%{_userunitdir}/starter.service.d
-install -m 644 units/container_starter.conf %{buildroot}%{_userunitdir}/starter.service.d
-
-# scim container plugin
-mkdir -p %{buildroot}%{_userunitdir}/scim.service.d
-install -m 644 units/container_scim.conf %{buildroot}%{_userunitdir}/scim.service.d
-
 %files
 %license LICENSE.Apache-2.0
 %manifest session-utils.manifest
@@ -54,8 +46,6 @@ install -m 644 units/container_scim.conf %{buildroot}%{_userunitdir}/scim.servic
 %{_userunitdir}/basic.target.wants/bind-user-contents.service
 %{_userunitdir}/container_postprocess.service
 #%{_userunitdir}/basic.target.wants/container_postprocess.service
-%{_userunitdir}/starter.service.d/container_starter.conf
-%{_userunitdir}/scim.service.d/container_scim.conf
 
 %post
 # How to test session-utils rpms

diff --git a/units/container_scim.conf b/units/container_scim.conf
deleted file mode 100644 (file)
index f42709c..0000000
--- a/units/container_scim.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Unit]
-ConditionPathExists=!/run/user/%U/.container

diff --git a/units/container_starter.conf b/units/container_starter.conf
deleted file mode 100644 (file)
index f42709c..0000000
--- a/units/container_starter.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Unit]
-ConditionPathExists=!/run/user/%U/.container