From 214fe03afdc77227df0878a2b8658830d74bfa2e Mon Sep 17 00:00:00 2001 From: INSUN PYO Date: Fri, 17 Aug 2018 11:22:24 +0900 Subject: [PATCH] Support container user: skip running starter and scim in container. Starter and scim should not run in container. The range of the container uid is 6000 to 6999. So in this range of uid, the starter and scim will skip execution. Signed-off-by: INSUN PYO Change-Id: Ie7cf0bd37eb5ab0cd2ca7785408a0073e9f04069 --- packaging/session-utils.spec | 11 +++++++++++ units/container_scim.conf | 2 ++ units/container_starter.conf | 2 ++ 3 files changed, 15 insertions(+) create mode 100644 units/container_scim.conf create mode 100644 units/container_starter.conf diff --git a/packaging/session-utils.spec b/packaging/session-utils.spec index 65428a9..91c7f45 100644 --- a/packaging/session-utils.spec +++ b/packaging/session-utils.spec @@ -37,9 +37,18 @@ 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 +# lazy mount mkdir -p %{buildroot}%{_unitdir}/wait-mount@opt-usr.service.d install -m 644 units/unlock_mnt.conf %{buildroot}%{_unitdir}/wait-mount@opt-usr.service.d +# 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 @@ -50,6 +59,8 @@ install -m 644 units/unlock_mnt.conf %{buildroot}%{_unitdir}/wait-mount@opt-usr. %{_userunitdir}/container_postprocess.service %{_userunitdir}/basic.target.wants/container_postprocess.service %{_unitdir}/wait-mount@opt-usr.service.d/unlock_mnt.conf +%{_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 new file mode 100644 index 0000000..f42709c --- /dev/null +++ b/units/container_scim.conf @@ -0,0 +1,2 @@ +[Unit] +ConditionPathExists=!/run/user/%U/.container diff --git a/units/container_starter.conf b/units/container_starter.conf new file mode 100644 index 0000000..f42709c --- /dev/null +++ b/units/container_starter.conf @@ -0,0 +1,2 @@ +[Unit] +ConditionPathExists=!/run/user/%U/.container -- 2.34.1