diff options
author | Yunmi Ha <yunmi.ha@samsung.com> | 2019-08-20 07:27:38 +0000 |
---|---|---|
committer | Yunmi Ha <yunmi.ha@samsung.com> | 2019-08-20 07:27:38 +0000 |
commit | c770c7497abb43dc554569490ec912aaa5dccf2c (patch) | |
tree | 96716b8f3401a0e034cf882fbdd93fa7a93b2d15 | |
parent | b5a095eb6461b15799e6fdfcfcbef3cb74589248 (diff) | |
download | email-service-c770c7497abb43dc554569490ec912aaa5dccf2c.tar.gz email-service-c770c7497abb43dc554569490ec912aaa5dccf2c.tar.bz2 email-service-c770c7497abb43dc554569490ec912aaa5dccf2c.zip |
Revert "tizen: Add additional unit for "unified" user session"
This reverts commit b5a095eb6461b15799e6fdfcfcbef3cb74589248.
We've optimized systemd-user without unified system/session.
So, we revert the patch for unified system/session.
Change-Id: I71cd1629623d5364788671ca129b3ffabc075d23
-rwxr-xr-x | packaging/email-service.spec | 15 | ||||
-rw-r--r-- | packaging/email-service@.service | 17 | ||||
-rw-r--r-- | packaging/email-service@.socket | 13 |
3 files changed, 0 insertions, 45 deletions
diff --git a/packaging/email-service.spec b/packaging/email-service.spec index 1947f0e..1e2039b 100755 --- a/packaging/email-service.spec +++ b/packaging/email-service.spec @@ -9,8 +9,6 @@ Source1: email-service.socket Source2: email-service.manifest Source3: email-service_init_db.sh Source4: email-service.service -Source5: email-service@.socket -Source6: email-service@.service Requires: connman Requires: gmime @@ -108,19 +106,10 @@ mkdir -p %{buildroot}%{_unitdir_user}/default.target.wants install -m 0644 %{SOURCE4} %{buildroot}%{_unitdir_user}/email-service.service ln -s ../email-service.service %{buildroot}%{_unitdir_user}/default.target.wants/email-service.service -mkdir -p %{buildroot}%{_unitdir} -mkdir -p %{buildroot}%{_unitdir}/user-default@.target.wants -install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/email-service@.service -ln -s ../email-service@.service %{buildroot}%{_unitdir}/user-default@.target.wants/email-service@.service - mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir_user}/email-service.socket ln -s ../email-service.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/email-service.socket -mkdir -p %{buildroot}%{_unitdir}/user-sockets@.target.wants -install -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/email-service@.socket -ln -s ../email-service@.socket %{buildroot}%{_unitdir}/user-sockets@.target.wants/email-service@.socket - install -m 0775 %{SOURCE3} %{buildroot}%{_bindir}/ %post -p /sbin/ldconfig @@ -157,10 +146,6 @@ systemctl daemon-reload %{_unitdir_user}/default.target.wants/email-service.service %{_unitdir_user}/email-service.socket %{_unitdir_user}/sockets.target.wants/email-service.socket -%{_unitdir}/email-service@.service -%{_unitdir}/user-default@.target.wants/email-service@.service -%{_unitdir}/email-service@.socket -%{_unitdir}/user-sockets@.target.wants/email-service@.socket %{_datarootdir}/dbus-1/services/email-service.service %license LICENSE %license LICENSE.BSD diff --git a/packaging/email-service@.service b/packaging/email-service@.service deleted file mode 100644 index 1bae050..0000000 --- a/packaging/email-service@.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -PartOf=userlogin@%i.target -Description=Start the Email 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_chown+eip -SecureBits=keep-caps -ExecStart=/usr/bin/email-service -Nice=5 -OOMScoreAdjust=100 -MemoryLimit=30M -EnvironmentFile=-/run/tizen-system-env - diff --git a/packaging/email-service@.socket b/packaging/email-service@.socket deleted file mode 100644 index 445496b..0000000 --- a/packaging/email-service@.socket +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -PartOf=userlogin@%i.target -DefaultDependencies=no -After=systemd-logind.service -Description=Email Service socket - -[Socket] -SocketUser=%i -ListenStream=/run/user/%i/.emailfw_socket -Service=email-service@%i.service - -[Install] -WantedBy=user-sockets@.target |