diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-10-10 14:03:31 +0100 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2012-10-11 12:51:03 +0100 |
| commit | 4f4c2c1924c480459ccf75316bee23073b6339d3 (patch) | |
| tree | b08a89cb8c6f254a7f888174ecea09c1eef4af0d | |
| parent | 2a1fed807130ce03d0cc23d13ccc649824ed2978 (diff) | |
| download | node-startup-controller-4f4c2c1924c480459ccf75316bee23073b6339d3.tar.gz | |
Emit "luc-group-started" even if failing to read the LUC
If we don't do this, the callback provided by the application will
not always be called and thus, sd_notify() will only be called if
reading the LUC is attempted. That breaks starting the NSC service
through systemd.
Signed-off-by: Jannis Pohlmann <jannis.pohlmann@codethink.co.uk>
Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk>
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | node-startup-controller/luc-starter.c | 6 |
2 files changed, 7 insertions, 0 deletions
@@ -2,6 +2,7 @@ x.y.z ===== * Make systemd respond to "READY" notifications from the NSC (GT-2212) * Adjust D-Bus interface definitions to match the Node State Manager. +* Fix starting through systemd if the LUC cannot be read from disk. 1.0.0 ===== diff --git a/node-startup-controller/luc-starter.c b/node-startup-controller/luc-starter.c index c52a22c..307aeb2 100644 --- a/node-startup-controller/luc-starter.c +++ b/node-startup-controller/luc-starter.c @@ -609,6 +609,12 @@ luc_starter_start_groups_for_real (LUCStarter *starter) DLT_STRING ("Failed to read the last user context:"), DLT_STRING (error->message)); g_error_free (error); + + /* notify others that we are finished starting the groups, even if + * that failed */ + g_signal_emit (starter, luc_starter_signals[SIGNAL_LUC_GROUPS_STARTED], + 0, NULL); + return; } |