Fix boot priority(after user-serviced, and logind)

Change-Id: I72befc0c89dfdaa0c6222ab022dfb17ddbe42c49
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/packaging/media-server-user.service b/packaging/media-server-user.service
index 23902d6..0fbedc8 100644 (file)
--- a/packaging/media-server-user.service
+++ b/packaging/media-server-user.service
@@ -5,7 +5,7 @@ Description=Media server user
 Type=idle
 CPUAccounting=true
 CPUQuota=10%
-ExecStart=/usr/bin/sh -c "/usr/bin/mediadb-update check_db;/usr/bin/mediadb-update check_mmc"
+ExecStart=/usr/bin/sh -c "/usr/bin/mediadb-update check_db;/usr/bin/mediadb-update -r `/usr/bin/tzplatform-get TZ_USER_CONTENT | /usr/bin/sed -e 's/^.*=//g'`;/usr/bin/mediadb-update check_mmc"
 
 [Install]
 WantedBy=default.target

diff --git a/packaging/media-server.service b/packaging/media-server.service
index b11ac81..97cb1b3 100644 (file)
--- a/packaging/media-server.service
+++ b/packaging/media-server.service
@@ -1,5 +1,7 @@
 [Unit]
 Description=Media server
+After=user@5001.service
+After=systemd-logind.service
 
 [Service]
 User=multimedia_fw

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index d270ca0..e54e52c 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.2.98
+Version:    0.2.99
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index e508a67..f10c11e 100755 (executable)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -1024,7 +1024,11 @@ gboolean msc_storage_scan_thread(void *data)
                else
                        storage_id = strdup("media");
 
-               ms_set_storage_scan_status(handle, storage_id, MEDIA_SCAN_PROCESSING, scan_data->uid);
+               ret = ms_set_storage_scan_status(handle, storage_id, MEDIA_SCAN_PROCESSING, scan_data->uid);
+               if (ret != MS_MEDIA_ERR_NONE) {
+                       MS_DBG_ERR("ms_set_storage_scan_status[%d]", ret);
+                       goto NEXT;
+               }
 
                /*start db updating */
                __msc_set_db_status(MS_DB_UPDATING, storage_type);