Move users systemd services to user

auxd and memd:
	from /usr/lib/systemd/system/
	to /usr/lib/systemd/user/

Change-Id: I00782cbb1bf4adc5921d3d30141eb76bb009a5ae
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>

diff --git a/daemon/main.c b/daemon/main.c
index 816fdb7..242296f 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -105,7 +105,8 @@ __da_manager manager =
 
 static int manager_auxd_client_init(__da_manager *m)
 {
-       const char AUXD_SOCKET_PATH[] = "/run/swap/swap_auxd.socket";
+       /* TODO: 5001 - user ID, now supports only single user */
+       const char AUXD_SOCKET_PATH[] = "/run/user_ext/5001/swap/auxd.socket";
 
        int ret;
        struct auxd_client *c;
@@ -137,7 +138,8 @@ static void manager_auxd_client_uninit(__da_manager *m)
 
 static int manager_memd_client_init(__da_manager *m)
 {
-       const char MEMD_SOCKET_PATH[] = "/run/swap/swap_memd.socket";
+       /* TODO: 5001 - user ID, now supports only single user */
+       const char MEMD_SOCKET_PATH[] = "/run/user_ext/5001/swap/memd.socket";
 
        int ret;
        struct memd_client *c;

diff --git a/packaging/swap-manager.manifest b/packaging/swap-manager.manifest
index 5bb6c33..364ca9e 100644 (file)
--- a/packaging/swap-manager.manifest
+++ b/packaging/swap-manager.manifest
@@ -1,6 +1,6 @@
 <manifest>
   <request>
-    <domain name="System::Privileged"/>
+    <domain name="_"/>
   </request>
   <assign>
     <!-- swap_manager -->

diff --git a/packaging/swap-manager.spec b/packaging/swap-manager.spec
index 1519733..f214140 100644 (file)
--- a/packaging/swap-manager.spec
+++ b/packaging/swap-manager.spec
@@ -152,9 +152,12 @@ export LIBDIR=%{_libdir}
 %if %{SYSTEMD_SUPPORT}
 
 # systemd
+#   system
 mkdir -p %{buildroot}%{_unitdir}
-mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
+#   user
+mkdir -p %{buildroot}%{_unitdir_user}
+mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
 
 #   swap_module
 install -m 0644 systemd/swap_module.service %{buildroot}%{_unitdir}/
@@ -168,14 +171,14 @@ install -m 0644 systemd/swap_manager.path %{buildroot}%{_unitdir}/
 ln -s ../swap_manager.path %{buildroot}%{_unitdir}/multi-user.target.wants/
 
 #   swap_auxd
-install -m 0644 systemd/swap_auxd.service %{buildroot}%{_unitdir}/
-install -m 0644 systemd/swap_auxd.socket %{buildroot}%{_unitdir}/
-ln -s ../swap_auxd.socket %{buildroot}%{_unitdir}/sockets.target.wants/
+install -m 0644 systemd/swap_auxd.service %{buildroot}%{_unitdir_user}/
+install -m 0644 systemd/swap_auxd.socket %{buildroot}%{_unitdir_user}/
+ln -s ../swap_auxd.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/
 
 #   swap_memd
-install -m 0644 systemd/swap_memd.service %{buildroot}%{_unitdir}/
-install -m 0644 systemd/swap_memd.socket %{buildroot}%{_unitdir}/
-ln -s ../swap_memd.socket %{buildroot}%{_unitdir}/sockets.target.wants/
+install -m 0644 systemd/swap_memd.service %{buildroot}%{_unitdir_user}/
+install -m 0644 systemd/swap_memd.socket %{buildroot}%{_unitdir_user}/
+ln -s ../swap_memd.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/
 
 # tmpfiles.d
 mkdir -p %{buildroot}%{_tmpfilesdir}
@@ -210,6 +213,7 @@ touch %{TZ_SYS_ETC}/resourced_proc_exclude.ini
 
 # update units
 systemctl daemon-reload
+su - owner -c "systemctl --user daemon-reload"
 
 
 %files
@@ -231,14 +235,14 @@ systemctl daemon-reload
 %{_unitdir}/multi-user.target.wants/swap_manager.path
 
 # swap_auxd
-%{_unitdir}/swap_auxd.socket
-%{_unitdir}/swap_auxd.service
-%{_unitdir}/sockets.target.wants/swap_auxd.socket
+%{_unitdir_user}/swap_auxd.socket
+%{_unitdir_user}/swap_auxd.service
+%{_unitdir_user}/sockets.target.wants/swap_auxd.socket
 
 # swap_memd
-%{_unitdir}/swap_memd.socket
-%{_unitdir}/swap_memd.service
-%{_unitdir}/sockets.target.wants/swap_memd.socket
+%{_unitdir_user}/swap_memd.socket
+%{_unitdir_user}/swap_memd.service
+%{_unitdir_user}/sockets.target.wants/swap_memd.socket
 
 %{_tmpfilesdir}/swap.conf
 %{_udevrulesdir}/99-swap_dev.rules

diff --git a/src/auxd/src/main.cpp b/src/auxd/src/main.cpp
index 7a024f1..24b74da 100644 (file)
--- a/src/auxd/src/main.cpp
+++ b/src/auxd/src/main.cpp
@@ -35,7 +35,9 @@
 
 
 static const int CONNECT_TIMEOUT = 10 * 1000;
-static const char SOCKET_PATH[] = "/run/swap/swap_auxd.socket";
+static const std::string SOCKET_PATH("/run/user_ext/" +
+                                     std::to_string(getuid()) +
+                                     "/swap/auxd.socket");
 
 
 static void do_aux_tizen_app_launch(const AUXD::LaunchRequest &request,

diff --git a/src/memd/src/main.cpp b/src/memd/src/main.cpp
index 7f167d6..d9f060c 100644 (file)
--- a/src/memd/src/main.cpp
+++ b/src/memd/src/main.cpp
@@ -33,7 +33,9 @@
 
 
 static const int CONNECT_TIMEOUT = 10 * 1000;
-static const char SOCKET_PATH[] = "/run/swap/swap_memd.socket";
+static const std::string SOCKET_PATH("/run/user_ext/" +
+                                     std::to_string(getuid()) +
+                                     "/swap/memd.socket");
 
 
 static bool read_file(const char *filename, std::string &out)

diff --git a/systemd/swap_auxd.service b/systemd/swap_auxd.service
index dc55ca6..739e83d 100644 (file)
--- a/systemd/swap_auxd.service
+++ b/systemd/swap_auxd.service
@@ -5,9 +5,6 @@ Description=swap_auxd service
 Type=notify
 NotifyAccess=main
 
-User=owner
-Group=users
-SmackProcessLabel=User
 Sockets=swap_auxd.socket
 
 ExecStart=/usr/bin/swap_auxd

diff --git a/systemd/swap_auxd.socket b/systemd/swap_auxd.socket
index a6b31c4..7a1230c 100644 (file)
--- a/systemd/swap_auxd.socket
+++ b/systemd/swap_auxd.socket
@@ -2,11 +2,10 @@
 Description=swap_auxd socket
 
 [Socket]
-ListenStream=/run/swap/swap_auxd.socket
-Service=swap_auxd.service
+ListenStream=/run/user_ext/%U/swap/auxd.socket
+ExecStartPost=/usr/bin/chmod 0666 /run/user_ext/%U/swap/auxd.socket
 
-SmackLabelIPIn=*
-SmackLabelIPOut=@
+Service=swap_auxd.service
 
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/swap_memd.service b/systemd/swap_memd.service
index 03c3399..7be86db 100644 (file)
--- a/systemd/swap_memd.service
+++ b/systemd/swap_memd.service
@@ -5,9 +5,6 @@ Description=swap_memd service
 Type=notify
 NotifyAccess=main
 
-User=owner
-Group=users
-SmackProcessLabel=User
 Sockets=swap_memd.socket
 
 ExecStart=/usr/bin/swap_memd

diff --git a/systemd/swap_memd.socket b/systemd/swap_memd.socket
index 0b9cbee..ea8232d 100644 (file)
--- a/systemd/swap_memd.socket
+++ b/systemd/swap_memd.socket
@@ -2,11 +2,10 @@
 Description=swap_memd socket
 
 [Socket]
-ListenStream=/run/swap/swap_memd.socket
-Service=swap_memd.service
+ListenStream=/run/user_ext/%U/swap/memd.socket
+ExecStartPost=/usr/bin/chmod 0666 /run/user_ext/%U/swap/memd.socket
 
-SmackLabelIPIn=*
-SmackLabelIPOut=@
+Service=swap_memd.service
 
 [Install]
 WantedBy=sockets.target