block, storage: Recevie StartupFinished signal instead of BootingDone signal

- Systemd sends StartupFinished signal when system session is ready.
- Receive StartupFinished(systemd) signal instaed of BootingDone(deviced) signal.

Change-Id: I4f31c437f2dbe5811a20d6ba38407b95bc78fb6f
Signed-off-by: pr.jung <pr.jung@samsung.com>

diff --git a/src/block/block.c b/src/block/block.c
index b4aaef3..0ffb5dd 100644 (file)
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -70,7 +70,6 @@
 #define UNMOUNT_RETRY  5
 #define TIMEOUT_MAKE_OBJECT 500 /* milliseconds */
 
-#define SIGNAL_BOOTING_DONE    "BootingDone"
 #define SIGNAL_POWEROFF_STATE  "ChangeState"
 
 #define BLOCK_DEVICE_ADDED      "DeviceAdded"
@@ -3241,11 +3240,11 @@ static void block_init(void *data)
        if (ret < 0)
                _E("fail to register block uevent : %d", ret);
 
-       /* register notifier for below each event */
-       register_dbus_signal(DEVICED_PATH_CORE,
-                       DEVICED_INTERFACE_CORE,
-                       SIGNAL_BOOTING_DONE,
-                       booting_done, NULL, NULL);
+       /* System Session is loaded completely */
+       register_dbus_signal(SYSTEMD_DBUS_PATH,
+                   SYSTEMD_DBUS_IFACE_MANAGER,
+                   SYSTEMD_DBUS_SIGNAL_SYSTEM_STARTUP_FINISHED,
+                   booting_done, NULL, NULL);
 
        register_dbus_signal(DEVICED_PATH_POWEROFF,
                        DEVICED_INTERFACE_POWEROFF,
@@ -3305,9 +3304,10 @@ static void block_exit(void *data)
        udev_exit(NULL);
 
        /* unregister notifier for below each event */
-       unregister_dbus_signal(DEVICED_PATH_CORE,
-                       DEVICED_INTERFACE_CORE,
-                       SIGNAL_BOOTING_DONE, booting_done);
+       unregister_dbus_signal(SYSTEMD_DBUS_PATH,
+                   SYSTEMD_DBUS_IFACE_MANAGER,
+                   SYSTEMD_DBUS_SIGNAL_SYSTEM_STARTUP_FINISHED,
+                   booting_done);
 
        unregister_dbus_signal(DEVICED_PATH_POWEROFF,
                        DEVICED_INTERFACE_POWEROFF,

diff --git a/src/shared/dbus_macro.h b/src/shared/dbus_macro.h
index 093c02e..43083b5 100755 (executable)
--- a/src/shared/dbus_macro.h
+++ b/src/shared/dbus_macro.h
@@ -40,6 +40,14 @@
 #define DBUS_INTERFACE_NAME                 DBUS_BUS_NAME
 
 /*
+ * System daemon
+ */
+#define SYSTEMD_DBUS_PATH                            "/org/freedesktop/systemd1"
+#define SYSTEMD_DBUS_DEST                            "org.freedesktop.systemd1"
+#define SYSTEMD_DBUS_IFACE_MANAGER                   SYSTEMD_DBUS_DEST ".Manager"
+#define SYSTEMD_DBUS_SIGNAL_SYSTEM_STARTUP_FINISHED  "StartupFinished"
+
+/*
  * Device daemon
  */
 #define DEVICED_BUS_NAME                    "org.tizen.system.deviced"

diff --git a/src/storage/storage.c b/src/storage/storage.c
index 2f4e3cf..79c1c1f 100755 (executable)
--- a/src/storage/storage.c
+++ b/src/storage/storage.c
@@ -49,7 +49,6 @@
 #define SIGNAL_LOWMEM_FULL      "Full"
 #define MEMNOTI_TIMER_INTERVAL  5000 /* milliseconds */
 
-#define SIGNAL_BOOTING_DONE    "BootingDone"
 #define SIGNAL_POWEROFF_STATE  "ChangeState"
 
 #define STORAGE_CONF_FILE       "/etc/storaged/storage.conf"
@@ -428,10 +427,11 @@ static void storage_init(void *data)
        }
 
        storage_config_load(&storage_internal_info);
-       register_dbus_signal(DEVICED_PATH_CORE,
-                       DEVICED_INTERFACE_CORE,
-                       SIGNAL_BOOTING_DONE,
-                       booting_done, NULL, NULL);
+       /* System Session is loaded completely */
+       register_dbus_signal(SYSTEMD_DBUS_PATH,
+                   SYSTEMD_DBUS_IFACE_MANAGER,
+                   SYSTEMD_DBUS_SIGNAL_SYSTEM_STARTUP_FINISHED,
+                   booting_done, NULL, NULL);
 
        register_dbus_signal(DEVICED_PATH_POWEROFF,
                        DEVICED_INTERFACE_POWEROFF,
@@ -446,9 +446,11 @@ static void storage_init(void *data)
 
 static void storage_exit(void *data)
 {
-       unregister_dbus_signal(DEVICED_PATH_CORE,
-                       DEVICED_INTERFACE_CORE,
-                       SIGNAL_BOOTING_DONE, booting_done);
+       /* unregister notifier for below each event */
+       unregister_dbus_signal(SYSTEMD_DBUS_PATH,
+                   SYSTEMD_DBUS_IFACE_MANAGER,
+                   SYSTEMD_DBUS_SIGNAL_SYSTEM_STARTUP_FINISHED,
+                   booting_done);
 
        unregister_dbus_signal(DEVICED_PATH_POWEROFF,
                        DEVICED_INTERFACE_POWEROFF,