system: fix localtime value in ubus info method output

[project/procd.git] / state.c

diff --git a/state.c b/state.c
index 41e4471..4ad9e2d 100644 (file)
--- a/state.c
+++ b/state.c
@@ -12,7 +12,9 @@
  * GNU General Public License for more details.
  */
 
  * GNU General Public License for more details.
  */
 

+#include <fcntl.h>

 #include <sys/reboot.h>
 #include <sys/reboot.h>

+#include <stdio.h>

 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>


@@ -23,6 +25,7 @@
 #include "plug/hotplug.h"
 #include "watchdog.h"
 #include "service/service.h"
 #include "plug/hotplug.h"
 #include "watchdog.h"
 #include "service/service.h"

+#include "utils/utils.h"

 
 enum {
        STATE_NONE = 0,
 
 enum {
        STATE_NONE = 0,


@@ -38,6 +41,58 @@ enum {
 static int state = STATE_NONE;
 static int reboot_event;
 
 static int state = STATE_NONE;
 static int reboot_event;
 

+static void set_stdio(const char* tty)
+{
+       if (chdir("/dev") ||
+           !freopen(tty, "r", stdin) ||
+           !freopen(tty, "w", stdout) ||
+           !freopen(tty, "w", stderr) ||
+           chdir("/"))
+               ERROR("failed to set stdio\n");
+       else
+               fcntl(STDERR_FILENO, F_SETFL, fcntl(STDERR_FILENO, F_GETFL) | O_NONBLOCK);
+}
+
+static void set_console(void)
+{
+       const char* tty;
+       char* split;
+       char line[ 20 ];
+       const char* try[] = { "tty0", "console", NULL }; /* Try the most common outputs */
+       int f, i = 0;
+
+       tty = get_cmdline_val("console",line,sizeof(line));
+       if (tty != NULL) {
+               split = strchr(tty, ',');
+               if ( split != NULL )
+                       *split = '\0';
+       } else {
+               // Try a default
+               tty=try[i];
+               i++;
+       }
+
+       if (chdir("/dev")) {
+               ERROR("failed to change dir to /dev\n");
+               return;
+       }
+       while (tty!=NULL) {
+               f = open(tty, O_RDONLY);
+               if (f >= 0) {
+                       close(f);
+                       break;
+               }
+
+               tty=try[i];
+               i++;
+       }
+       if (chdir("/"))
+               ERROR("failed to change dir to /\n");
+
+       if (tty != NULL)
+               set_stdio(tty);
+}
+

 static void state_enter(void)
 {
        char ubus_cmd[] = "/sbin/ubusd";
 static void state_enter(void)
 {
        char ubus_cmd[] = "/sbin/ubusd";


@@ -53,9 +108,9 @@ static void state_enter(void)
        case STATE_UBUS:
                // try to reopen incase the wdt was not available before coldplug
                watchdog_init(0);
        case STATE_UBUS:
                // try to reopen incase the wdt was not available before coldplug
                watchdog_init(0);

+               set_stdio("console");

                LOG("- ubus -\n");
                procd_connect_ubus();
                LOG("- ubus -\n");
                procd_connect_ubus();

-               service_init();

                service_start_early("ubus", ubus_cmd);
                break;
 
                service_start_early("ubus", ubus_cmd);
                break;
 


@@ -66,6 +121,9 @@ static void state_enter(void)
                procd_inittab_run("askconsole");
                procd_inittab_run("askfirst");
                procd_inittab_run("sysinit");
                procd_inittab_run("askconsole");
                procd_inittab_run("askfirst");
                procd_inittab_run("sysinit");

+
+               // switch to syslog log channel
+               ulog_open(ULOG_SYSLOG, LOG_DAEMON, "procd");

                break;
 
        case STATE_RUNNING:
                break;
 
        case STATE_RUNNING:


@@ -73,12 +131,16 @@ static void state_enter(void)
                break;
 
        case STATE_SHUTDOWN:
                break;
 
        case STATE_SHUTDOWN:

+               /* Redirect output to the console for the users' benefit */
+               set_console();

                LOG("- shutdown -\n");
                procd_inittab_run("shutdown");
                sync();
                break;
 
        case STATE_HALT:
                LOG("- shutdown -\n");
                procd_inittab_run("shutdown");
                sync();
                break;
 
        case STATE_HALT:

+               // To prevent killed processes from interrupting the sleep
+               signal(SIGCHLD, SIG_IGN);

                LOG("- SIGTERM processes -\n");
                kill(-1, SIGTERM);
                sync();
                LOG("- SIGTERM processes -\n");
                kill(-1, SIGTERM);
                sync();


@@ -87,6 +149,7 @@ static void state_enter(void)
                kill(-1, SIGKILL);
                sync();
                sleep(1);
                kill(-1, SIGKILL);
                sync();
                sleep(1);

+#ifndef DISABLE_INIT

                if (reboot_event == RB_POWER_OFF)
                        LOG("- power down -\n");
                else
                if (reboot_event == RB_POWER_OFF)
                        LOG("- power down -\n");
                else


@@ -102,9 +165,11 @@ static void state_enter(void)
                        reboot(reboot_event);
                        _exit(EXIT_SUCCESS);
                }
                        reboot(reboot_event);
                        _exit(EXIT_SUCCESS);
                }

-

                while (1)
                        sleep(1);
                while (1)
                        sleep(1);

+#else
+               exit(0);
+#endif

                break;
 
        default:
                break;
 
        default: