lazy_mount: remove unnecessary code.

Unencrypted /opt/usr mount is separated by opt-usr.mount and run this from local-fs.target.
So you no longer need to mount it in the starter.

Signed-off-by: INSUN PYO <insun.pyo@samsung.com>
Change-Id: I4c327a19d32d82578185c34e4fc6ae5616920f99

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5035b1e..9d3bb1a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,6 @@ pkg_check_modules(pkgs REQUIRED
        tts
        capi-message-port
        efl-extension
-       liblazymount
        libsystemd-daemon
        ode
 )
@@ -128,7 +127,6 @@ pkg_check_modules(pkgs REQUIRED
        deviced
        edbus
        dbus-1
-       liblazymount
        libsystemd-daemon
        rua
 )

diff --git a/packaging/starter.spec b/packaging/starter.spec
index 0a970b6..7110df2 100644 (file)
--- a/packaging/starter.spec
+++ b/packaging/starter.spec
@@ -27,7 +27,6 @@ BuildRequires:  pkgconfig(capi-message-port)
 BuildRequires:  pkgconfig(capi-telephony)
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(efl-extension)
-BuildRequires:  pkgconfig(liblazymount)
 BuildRequires:  pkgconfig(libsystemd-daemon)
 BuildRequires:  pkgconfig(ode)
 

diff --git a/src/mobile/starter.c b/src/mobile/starter.c
index 228b642..4828329 100755 (executable)
--- a/src/mobile/starter.c
+++ b/src/mobile/starter.c
@@ -26,7 +26,6 @@
 #include <Ecore_Wl2.h>
 
 #include <E_DBus.h>
-#include <lazy_mount.h>
 #include <systemd/sd-daemon.h>
 #include <ode/internal-encryption.h>
 
@@ -175,25 +174,8 @@ static int _check_dead_signal(int pid, void *data)
 
 
 
-static void _mount_and_launch_apps(void)
+static void _launch_apps(void)
 {
-       int ret = 0;
-
-       /*
-        * Do mount user data partition
-        */
-       ret = do_mount_user();
-       if (ret != 0) {
-               _E("Failed to mount [/opt] area");
-               return;
-       }
-
-       ret = wait_mount_user();
-       if (ret != 0) {
-               _E("Failed to wait mount for [/opt] area");
-               return;
-       }
-
        /* Tells the service manager that service startup is finished */
        sd_notify(0, "READY=1");
 
@@ -362,7 +344,7 @@ int starter_execute_ode_process(int booting_state)
                                _E("Failed to set mount event cb");
                        }
                } else {
-                       _mount_and_launch_apps();
+                       _launch_apps();
                }
        } else if (booting_state == AFTER_LOCKSCREEN) {
                if (ode_state == ODE_STATE_ENCRYPTED) {

diff --git a/src/wearable/starter.c b/src/wearable/starter.c
index a34af83..ebd7e36 100755 (executable)
--- a/src/wearable/starter.c
+++ b/src/wearable/starter.c
@@ -28,7 +28,6 @@
 #include <Ecore_Wl2.h>
 #include <malloc.h>
 
-#include <lazy_mount.h>
 #include <systemd/sd-daemon.h>
 
 #include "hw_key.h"