projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix procd not handling rapid reboot signals very well
[project/procd.git]
/
state.c
diff --git
a/state.c
b/state.c
index
71890a2
..
bba5966
100644
(file)
--- a/
state.c
+++ b/
state.c
@@
-18,8
+18,9
@@
#include "procd.h"
#include "syslog.h"
#include "procd.h"
#include "syslog.h"
-#include "hotplug.h"
+#include "
plug/
hotplug.h"
#include "watchdog.h"
#include "watchdog.h"
+#include "service/service.h"
enum {
STATE_NONE = 0,
enum {
STATE_NONE = 0,
@@
-36,22
+37,26
@@
static int reboot_event;
static void state_enter(void)
{
static void state_enter(void)
{
+ char ubus_cmd[] = "/sbin/ubusd";
switch (state) {
case STATE_EARLY:
LOG("- early -\n");
switch (state) {
case STATE_EARLY:
LOG("- early -\n");
- watchdog_init();
+ watchdog_init(
0
);
hotplug("/etc/hotplug.json");
procd_coldplug();
break;
case STATE_INIT:
hotplug("/etc/hotplug.json");
procd_coldplug();
break;
case STATE_INIT:
- // check if the wdt appeared during coldplug
- if (!watchdog_fd())
- watchdog_init();
- LOG("- init -\n");
- log_init();
+ // try to reopen incase the wdt was not available before coldplug
+ watchdog_init(0);
+ LOG("- ubus -\n");
procd_connect_ubus();
procd_connect_ubus();
+
+ LOG("- init -\n");
+ service_init();
+ service_start_early("ubus", ubus_cmd);
+
procd_inittab();
procd_inittab_run("respawn");
procd_inittab_run("askconsole");
procd_inittab();
procd_inittab_run("respawn");
procd_inittab_run("askconsole");
@@
-82,14
+87,16
@@
static void state_enter(void)
void procd_state_next(void)
{
void procd_state_next(void)
{
- DEBUG(
2
, "Change state %d -> %d\n", state, state + 1);
+ DEBUG(
4
, "Change state %d -> %d\n", state, state + 1);
state++;
state_enter();
}
void procd_shutdown(int event)
{
state++;
state_enter();
}
void procd_shutdown(int event)
{
- DEBUG(1, "Shutting down system with event %x\n", reboot_event);
+ if (state >= STATE_SHUTDOWN)
+ return;
+ DEBUG(2, "Shutting down system with event %x\n", event);
reboot_event = event;
state = STATE_SHUTDOWN;
state_enter();
reboot_event = event;
state = STATE_SHUTDOWN;
state_enter();