Revert "Supporting Internal Media Path Compatibility"

This reverts commit 23de75841e9bb1a712b06352b71d9107302c06e9.

Change-Id: Id20c18851b7dfd2aa3f4d8dd14b446f7e7f7cc30

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8c5f4b3d40718194e63ce55c154ee539810697b..55924cda360bfea6f7b75e2e1ce44e09e351e9cd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,6 @@ SET(dependents
                gio-2.0
                libtzplatform-config
                capi-system-system-settings
-               mount
 )
 SET(pc_dependents "capi-base-common")
 

diff --git a/packaging/libstorage.spec b/packaging/libstorage.spec
index ee26b84cc144de2aed0100c9b51cab5f1b758a72..0204e53d800220a7de59bda293580756143dcdb7 100644 (file)
--- a/packaging/libstorage.spec
+++ b/packaging/libstorage.spec
@@ -14,7 +14,6 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(capi-system-system-settings)
-BuildRequires:  pkgconfig(mount)
 
 %description
 development package of library to get storage

diff --git a/src/storage-internal.c b/src/storage-internal.c
index 8713a1252a4c1956fc59d6810fe2422345d9f6d9..1867deff6554ed2c132eaf2c55a8d986dd3f399c 100755 (executable)
--- a/src/storage-internal.c
+++ b/src/storage-internal.c
@@ -22,12 +22,10 @@
 #include <limits.h>
 #include <sys/statvfs.h>
 #include <tzplatform_config.h>
-#include <libmount.h>
 
 #include "common.h"
 #include "log.h"
 
-#define COMPAT_DIR "/opt/usr/media"
 
 #ifndef __USE_FILE_OFFSET64
 int __WEAK__ storage_get_internal_memory_size(struct statvfs *buf);
@@ -62,32 +60,7 @@ static int internal_get_space(unsigned long long *total, unsigned long long *ava
 
 static const char *internal_get_root(void)
 {
-       struct libmnt_table *t = NULL;
-       int r = 0;
-       struct libmnt_fs *fs;
-       const char *ret;
-
-       ret = tzplatform_getenv(TZ_USER_CONTENT);
-
-       t = mnt_new_table();
-       if(!t)
-               return ret;
-
-       r = mnt_table_parse_mtab(t, NULL);
-       if(r < 0){
-               mnt_free_table(t);
-               return ret;
-       }
-
-       fs = mnt_table_find_target(t,COMPAT_DIR,MNT_ITER_BACKWARD);
-       if(fs){
-               // TODO : mnt_fs_get_root(fs) should be matched to tzplatform_getenv(TZ_USER_CONTENT).
-               ret = COMPAT_DIR;
-       }
-
-       mnt_free_table(t);
-
-       return ret;
+       return tzplatform_getenv(TZ_USER_CONTENT);
 }
 
 const struct storage_ops internal = {