projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Error and return when failing stat('/dev/console').
[project/procd.git]
/
state.c
diff --git
a/state.c
b/state.c
index
8fe931e
..
90e883c
100644
(file)
--- a/
state.c
+++ b/
state.c
@@
-40,16
+40,19
@@
static void state_enter(void)
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:
+ // try to reopen incase the wdt was not available before coldplug
+ watchdog_init(0);
LOG("- init -\n");
log_init();
procd_connect_ubus();
procd_inittab();
LOG("- init -\n");
log_init();
procd_connect_ubus();
procd_inittab();
+ procd_inittab_run("respawn");
procd_inittab_run("askconsole");
procd_inittab_run("askfirst");
procd_inittab_run("sysinit");
procd_inittab_run("askconsole");
procd_inittab_run("askfirst");
procd_inittab_run("sysinit");
@@
-62,12
+65,11
@@
static void state_enter(void)
case STATE_SHUTDOWN:
LOG("- shutdown -\n");
procd_inittab_run("shutdown");
case STATE_SHUTDOWN:
LOG("- shutdown -\n");
procd_inittab_run("shutdown");
+ sync();
break;
case STATE_HALT:
LOG("- reboot -\n");
break;
case STATE_HALT:
LOG("- reboot -\n");
- sync();
- sleep(1);
reboot(reboot_event);
break;
reboot(reboot_event);
break;
@@
-86,7
+88,7
@@
void procd_state_next(void)
void procd_shutdown(int event)
{
void procd_shutdown(int event)
{
- DEBUG(1, "Shutting down system with event %x\n",
reboot_
event);
+ DEBUG(1, "Shutting down system with event %x\n", event);
reboot_event = event;
state = STATE_SHUTDOWN;
state_enter();
reboot_event = event;
state = STATE_SHUTDOWN;
state_enter();