Initialize late modules after BootingDone

Change-Id: Iadd21d6a6e402fbdb8bbef9e7d981ed3b8bc3c83
Signed-off-by: Michal Bloch <m.bloch@partner.samsung.com>

diff --git a/src/common/module.c b/src/common/module.c
index d0312b1..e16094d 100644 (file)
--- a/src/common/module.c
+++ b/src/common/module.c
@@ -119,6 +119,10 @@ static void module_initcall_level(void *data, int priority)
 void modules_init(void *data)
 {
        module_initcall_level(data, MODULE_PRIORITY_NORMAL);
+}
+
+void modules_init_late(void *data)
+{
        module_initcall_level(data, MODULE_PRIORITY_LATE);
 }
 

diff --git a/src/common/module.h b/src/common/module.h
index 6764dfc..867a342 100644 (file)
--- a/src/common/module.h
+++ b/src/common/module.h
@@ -93,6 +93,7 @@ void remove_module(const struct module_ops *module);
 
 void modules_check_runtime_support(void *data);
 void modules_init(void *data);
+void modules_init_late(void *data);
 void modules_exit(void *data);
 void modules_restore(void *data);
 void modules_dump(FILE *fp, int mode);

diff --git a/src/proc-stat/proc-monitor.c b/src/proc-stat/proc-monitor.c
index 5570c5f..caf601a 100644 (file)
--- a/src/proc-stat/proc-monitor.c
+++ b/src/proc-stat/proc-monitor.c
@@ -829,6 +829,7 @@ EXPORT_TEST void proc_dbus_lcd_off(GVariant *params)
 EXPORT_TEST void booting_done_signal_handler(GVariant *params)
 {
        _I("booting done");
+       modules_init_late(NULL);
        resourced_notify(RESOURCED_NOTIFIER_BOOTING_DONE, NULL);
 }
 

diff --git a/src/resourced/main.c b/src/resourced/main.c
index 7a43bbf..0a5a847 100644 (file)
--- a/src/resourced/main.c
+++ b/src/resourced/main.c
@@ -59,8 +59,10 @@ int main(int argc, char **argv)
                modules_init(NULL);
        }
 
-       if (resourced_restarted())
+       if (resourced_restarted()) {
+               modules_init_late(NULL);
                resourced_notify(RESOURCED_NOTIFIER_BOOTING_DONE, NULL);
+       }
 
        sd_notify(0, "READY=1");