Modify user id from root to system and replace database creation to source code

Change-Id: Id37837c93e43cc512cfb06011e9e5a6d68056eab
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/packaging/capi-media-controller.spec b/packaging/capi-media-controller.spec
index 3fad5a165d5a200bbbba7337de074e2b90fcb4ce..edf01da48975d3daee940b670dd469f24b53d8b7 100644 (file)
--- a/packaging/capi-media-controller.spec
+++ b/packaging/capi-media-controller.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-controller
 Summary:    A media controller library in Tizen Native API
-Version:    0.1.20
+Version:    0.1.21
 Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0
@@ -85,20 +85,6 @@ install -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/mediacontroller-ipc.socket
 ln -s ../mediacontroller.socket %{buildroot}%{_unitdir}/sockets.target.wants/mediacontroller.socket
 ln -s ../mediacontroller-ipc.socket %{buildroot}%{_unitdir}/sockets.target.wants/mediacontroller-ipc.socket
 
-# Setup DB creation in user session
-%if 0%{?multi_user}
-mkdir -p %{buildroot}%{_unitdir_user}
-mkdir -p %{buildroot}%{_unitdir_user}/default.target.wants/
-install -m 644 %{SOURCE3} %{buildroot}%{_unitdir_user}/media-controller-user.service
-ln -s ../media-controller-user.service %{buildroot}%{_unitdir_user}/default.target.wants/media-controller-user.service
-%endif
-
-# Create DB
-%if 0%{?multi_user}
-mkdir -p %{buildroot}%{_bindir}
-install -m 0775 %{SOURCE1001} %{buildroot}%{_bindir}/media-controller_create_db.sh
-%endif
-
 %post
 
 %postun
@@ -112,9 +98,6 @@ install -m 0775 %{SOURCE1001} %{buildroot}%{_bindir}/media-controller_create_db.
 %files -n mediacontroller
 %defattr(-,root,root,-)
 %{_bindir}/mediacontroller
-%if 0%{?multi_user}
-%{_bindir}/media-controller_create_db.sh
-%endif
 %manifest media-controller-service.manifest
 %defattr(-,multimedia_fw,multimedia_fw,-)
 %{_unitdir}/mediacontroller.service
@@ -122,10 +105,6 @@ install -m 0775 %{SOURCE1001} %{buildroot}%{_bindir}/media-controller_create_db.
 %{_unitdir}/sockets.target.wants/mediacontroller.socket
 %{_unitdir}/mediacontroller-ipc.socket
 %{_unitdir}/sockets.target.wants/mediacontroller-ipc.socket
-%if 0%{?multi_user}
-%{_unitdir_user}/media-controller-user.service
-%{_unitdir_user}/default.target.wants/media-controller-user.service
-%endif
 %{_datadir}/license/mediacontroller
 
 %files devel

diff --git a/packaging/media-controller_create_db.sh b/packaging/media-controller_create_db.sh
deleted file mode 100755 (executable)
index ac71ac8..0000000
--- a/packaging/media-controller_create_db.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-source /etc/tizen-platform.conf
-
-mkdir -p $TZ_USER_DB
-
-#Create DB file
-sqlite3 ${TZ_USER_DB}/.media_controller.db 'PRAGMA journal_mode = PERSIST;
-               CREATE TABLE IF NOT EXISTS latest_server (server_name TEXT PRIMARY KEY);
-'

diff --git a/packaging/mediacontroller.service b/packaging/mediacontroller.service
index fc2b419288b3258ac2ed7a6eed7ffade005169ec..41e1462dec60a533f2a1630e0de30e0ea66f3ca9 100755 (executable)
--- a/packaging/mediacontroller.service
+++ b/packaging/mediacontroller.service
@@ -2,7 +2,7 @@
 Description=Media controller
 
 [Service]
-Owner=multimedia_fw
+User=multimedia_fw
 Group=multimedia_fw
 ExecStart=/usr/bin/mediacontroller
 Type=simple

diff --git a/packaging/mediacontroller.socket b/packaging/mediacontroller.socket
index af9d83a61a707fa103d4401ffeec32d23ebde14c..b1ae5b10cc72f43e557a239f7d78c9aeaa7b6870 100644 (file)
--- a/packaging/mediacontroller.socket
+++ b/packaging/mediacontroller.socket
@@ -2,7 +2,7 @@
 Description=MediaController Service socket
 
 [Socket]
-SocketOwner=multimedia_fw
+SocketUser=multimedia_fw
 SocketGroup=multimedia_fw
 ListenStream=/run/.mediacontroller.sock
 Service=mediacontroller.service

diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c
index 707b1b075be456814110d138cc412b9edb5c51fa..003d20a4c2203229921153326ed8abc44f20fbb2 100644 (file)
--- a/svc/media_controller_db_util.c
+++ b/svc/media_controller_db_util.c
@@ -207,7 +207,6 @@ int mc_db_util_connect(void **handle, uid_t uid)
 
        *handle = db_handle;
 
-#ifndef MULTI_USER
        char *sql = NULL;
        sql = sqlite3_mprintf("%s", "PRAGMA journal_mode = PERSIST");
        ret = sqlite3_exec(*handle, sql, NULL, NULL, NULL);
@@ -223,7 +222,6 @@ int mc_db_util_connect(void **handle, uid_t uid)
 
                return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
        }
-#endif
 
        return MEDIA_CONTROLLER_ERROR_NONE;
 }