X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=init%2Finit.c;h=1caf45b8d40e51803ec0d92350bd9e7ff1a37874;hb=15437e3e2a0cc9e4ba25066fd562b2862d38799b;hp=68a59d88e73e3bdbb7a9552a64c5d641725495ad;hpb=fb0eba706cccd510d99c4c5339a76dd15bc8a628;p=oweals%2Fbusybox.git diff --git a/init/init.c b/init/init.c index 68a59d88e..1caf45b8d 100644 --- a/init/init.c +++ b/init/init.c @@ -10,11 +10,15 @@ */ #include "libbb.h" +#include #include #include -#include -#define INIT_BUFFS_SIZE 256 +/* Was a CONFIG_xxx option. A lot of people were building + * not fully functional init by switching it on! */ +#define DEBUG_INIT 0 + +#define COMMAND_SIZE 256 #define CONSOLE_NAME_SIZE 32 #define MAXENV 16 /* Number of env. vars */ @@ -33,38 +37,29 @@ #endif /* Allowed init action types */ -#define SYSINIT 0x001 -#define RESPAWN 0x002 -#define ASKFIRST 0x004 -#define WAIT 0x008 -#define ONCE 0x010 -#define CTRLALTDEL 0x020 -#define SHUTDOWN 0x040 -#define RESTART 0x080 - -#define STR_SYSINIT "\x01" -#define STR_RESPAWN "\x02" -#define STR_ASKFIRST "\x04" -#define STR_WAIT "\x08" -#define STR_ONCE "\x10" -#define STR_CTRLALTDEL "\x20" -#define STR_SHUTDOWN "\x40" -#define STR_RESTART "\x80" +#define SYSINIT 0x01 +#define RESPAWN 0x02 +/* like respawn, but wait for to be pressed on tty: */ +#define ASKFIRST 0x04 +#define WAIT 0x08 +#define ONCE 0x10 +#define CTRLALTDEL 0x20 +#define SHUTDOWN 0x40 +#define RESTART 0x80 /* Set up a linked list of init_actions, to be read from inittab */ struct init_action { struct init_action *next; pid_t pid; - uint8_t action; + uint8_t action_type; char terminal[CONSOLE_NAME_SIZE]; - char command[INIT_BUFFS_SIZE]; + char command[COMMAND_SIZE]; }; /* Static variables */ static struct init_action *init_action_list = NULL; static const char *log_console = VC_5; -static sig_atomic_t got_cont = 0; enum { L_LOG = 0x1, @@ -85,25 +80,22 @@ enum { #endif }; -static const char *const environment[] = { - "HOME=/", - bb_PATH_root_path, - "SHELL=/bin/sh", - "USER=root", - NULL -}; - /* Function prototypes */ -static void delete_init_action(struct init_action *a); -static void halt_reboot_pwoff(int sig) ATTRIBUTE_NORETURN; +static void halt_reboot_pwoff(int sig) NORETURN; -/* TODO: move to libbb? */ -static int waitfor(pid_t runpid) +static void waitfor(pid_t pid) { - return safe_waitpid(runpid, NULL, 0); + /* waitfor(run(x)): protect against failed fork inside run() */ + if (pid <= 0) + return; + + /* Wait for any child (prevent zombies from exiting orphaned processes) + * but exit the loop only when specified one has exited. */ + while (wait(NULL) != pid) + continue; } -static void loop_forever(void) ATTRIBUTE_NORETURN; +static void loop_forever(void) NORETURN; static void loop_forever(void) { while (1) @@ -111,28 +103,31 @@ static void loop_forever(void) } /* Print a message to the specified device. - * Device may be bitwise-or'd from L_LOG | L_CONSOLE */ -#define messageD(...) do { if (ENABLE_DEBUG_INIT) message(__VA_ARGS__); } while (0) -static void message(int device, const char *fmt, ...) + * "where" may be bitwise-or'd from L_LOG | L_CONSOLE + * NB: careful, we can be called after vfork! + */ +#define messageD(...) do { if (DEBUG_INIT) message(__VA_ARGS__); } while (0) +static void message(int where, const char *fmt, ...) __attribute__ ((format(printf, 2, 3))); -static void message(int device, const char *fmt, ...) +static void message(int where, const char *fmt, ...) { static int log_fd = -1; va_list arguments; - int l; + unsigned l; char msg[128]; msg[0] = '\r'; va_start(arguments, fmt); - vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments); + l = vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments); + if (l > sizeof(msg) - 2) + l = sizeof(msg) - 2; + msg[l] = '\0'; va_end(arguments); - msg[sizeof(msg) - 2] = '\0'; - l = strlen(msg); if (ENABLE_FEATURE_INIT_SYSLOG) { /* Log the message to syslogd */ - if (device & L_LOG) { - /* don't out "\r" */ + if (where & L_LOG) { + /* don't print out "\r" */ openlog(applet_name, 0, LOG_DAEMON); syslog(LOG_INFO, "init: %s", msg + 1); closelog(); @@ -146,27 +141,27 @@ static void message(int device, const char *fmt, ...) * It's mine, all mine! Muhahahaha! */ if (log_fd < 0) { if (!log_console) { - log_fd = 2; + log_fd = STDERR_FILENO; } else { log_fd = device_open(log_console, O_WRONLY | O_NONBLOCK | O_NOCTTY); if (log_fd < 0) { bb_error_msg("can't log to %s", log_console); - device = L_CONSOLE; + where = L_CONSOLE; } else { close_on_exec_on(log_fd); } } } - if (device & L_LOG) { + if (where & L_LOG) { full_write(log_fd, msg, l); - if (log_fd == 2) + if (log_fd == STDERR_FILENO) return; /* don't print dup messages */ } } - if (device & L_CONSOLE) { + if (where & L_CONSOLE) { /* Send console messages to console so people will see them. */ - full_write(2, msg, l); + full_write(STDERR_FILENO, msg, l); } } @@ -200,23 +195,27 @@ static void console_init(void) char *s; s = getenv("CONSOLE"); - if (!s) s = getenv("console"); + if (!s) + s = getenv("console"); if (s) { int fd = open(s, O_RDWR | O_NONBLOCK | O_NOCTTY); if (fd >= 0) { - dup2(fd, 0); - dup2(fd, 1); - dup2(fd, 2); - while (fd > 2) close(fd--); + dup2(fd, STDIN_FILENO); + dup2(fd, STDOUT_FILENO); + xmove_fd(fd, STDERR_FILENO); } messageD(L_LOG, "console='%s'", s); } else { - /* Make sure fd 0,1,2 are not closed */ + /* Make sure fd 0,1,2 are not closed + * (so that they won't be used by future opens) */ bb_sanitize_stdio(); +// Users report problems +// /* Make sure init can't be blocked by writing to stderr */ +// fcntl(STDERR_FILENO, F_SETFL, fcntl(STDERR_FILENO, F_GETFL) | O_NONBLOCK); } s = getenv("TERM"); - if (ioctl(0, TIOCGSERIAL, &sr) == 0) { + if (ioctl(STDIN_FILENO, TIOCGSERIAL, &sr) == 0) { /* Force the TERM setting to vt102 for serial console * if TERM is set to linux (the default) */ if (!s || strcmp(s, "linux") == 0) @@ -227,7 +226,8 @@ static void console_init(void) putenv((char*)"TERM=linux"); } -/* Set terminal settings to reasonable defaults */ +/* Set terminal settings to reasonable defaults. + * NB: careful, we can be called after vfork! */ static void set_sane_term(void) { struct termios tty; @@ -244,7 +244,7 @@ static void set_sane_term(void) tty.c_cc[VSTOP] = 19; /* C-s */ tty.c_cc[VSUSP] = 26; /* C-z */ - /* use line dicipline 0 */ + /* use line discipline 0 */ tty.c_line = 0; /* Make it be sane */ @@ -261,168 +261,174 @@ static void set_sane_term(void) tty.c_lflag = ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHOCTL | ECHOKE | IEXTEN; - tcsetattr(STDIN_FILENO, TCSANOW, &tty); + tcsetattr_stdin_TCSANOW(&tty); } -/* Open the new terminal device */ +/* Open the new terminal device. + * NB: careful, we can be called after vfork! */ static void open_stdio_to_tty(const char* tty_name, int exit_on_failure) { /* empty tty_name means "use init's tty", else... */ if (tty_name[0]) { int fd; - close(0); + close(STDIN_FILENO); /* fd can be only < 0 or 0: */ fd = device_open(tty_name, O_RDWR); if (fd) { - message(L_LOG | L_CONSOLE, "Can't open %s: %s", + message(L_LOG | L_CONSOLE, "can't open %s: %s", tty_name, strerror(errno)); if (exit_on_failure) - _exit(1); - if (ENABLE_DEBUG_INIT) + _exit(EXIT_FAILURE); + if (DEBUG_INIT) _exit(2); + /* NB: we don't reach this if we were called after vfork. + * Thus halt_reboot_pwoff() itself need not be vfork-safe. */ halt_reboot_pwoff(SIGUSR1); /* halt the system */ } - dup2(0, 1); - dup2(0, 2); + dup2(STDIN_FILENO, STDOUT_FILENO); + dup2(STDIN_FILENO, STDERR_FILENO); } set_sane_term(); } +/* Wrapper around exec: + * Takes string (max COMMAND_SIZE chars). + * If chars like '>' detected, execs '[-]/bin/sh -c "exec ......."'. + * Otherwise splits words on whitespace, deals with leading dash, + * and uses plain exec(). + * NB: careful, we can be called after vfork! + */ +static void init_exec(const char *command) +{ + char *cmd[COMMAND_SIZE / 2]; + char buf[COMMAND_SIZE + 6]; /* COMMAND_SIZE+strlen("exec ")+1 */ + int dash = (command[0] == '-' /* maybe? && command[1] == '/' */); + + /* See if any special /bin/sh requiring characters are present */ + if (strpbrk(command, "~`!$^&*()=|\\{}[];\"'<>?") != NULL) { + strcpy(buf, "exec "); + strcpy(buf + 5, command + dash); /* excluding "-" */ + /* NB: LIBBB_DEFAULT_LOGIN_SHELL define has leading dash */ + cmd[0] = (char*)(LIBBB_DEFAULT_LOGIN_SHELL + !dash); + cmd[1] = (char*)"-c"; + cmd[2] = buf; + cmd[3] = NULL; + } else { + /* Convert command (char*) into cmd (char**, one word per string) */ + char *word, *next; + int i = 0; + next = strcpy(buf, command); /* including "-" */ + while ((word = strsep(&next, " \t")) != NULL) { + if (*word != '\0') { /* not two spaces/tabs together? */ + cmd[i] = word; + i++; + } + } + cmd[i] = NULL; + } + /* If we saw leading "-", it is interactive shell. + * Try harder to give it a controlling tty. + * And skip "-" in actual exec call. */ + if (dash) { + /* _Attempt_ to make stdin a controlling tty. */ + if (ENABLE_FEATURE_INIT_SCTTY) + ioctl(STDIN_FILENO, TIOCSCTTY, 0 /*only try, don't steal*/); + } + BB_EXECVP(cmd[0] + dash, cmd); + message(L_LOG | L_CONSOLE, "cannot run '%s': %s", cmd[0], strerror(errno)); + /* returns if execvp fails */ +} + /* Used only by run_actions */ static pid_t run(const struct init_action *a) { - int i; pid_t pid; - char *s, *tmpCmd, *cmdpath; - char *cmd[INIT_BUFFS_SIZE]; - char buf[INIT_BUFFS_SIZE + 6]; /* INIT_BUFFS_SIZE+strlen("exec ")+1 */ sigset_t nmask, omask; /* Block sigchild while forking (why?) */ sigemptyset(&nmask); sigaddset(&nmask, SIGCHLD); sigprocmask(SIG_BLOCK, &nmask, &omask); - pid = fork(); + if (BB_MMU && (a->action_type & ASKFIRST)) + pid = fork(); + else + pid = vfork(); sigprocmask(SIG_SETMASK, &omask, NULL); if (pid < 0) - message(L_LOG | L_CONSOLE, "Can't fork"); + message(L_LOG | L_CONSOLE, "can't fork"); if (pid) return pid; /* Child */ /* Reset signal handlers that were set by the parent process */ - signal(SIGUSR1, SIG_DFL); - signal(SIGUSR2, SIG_DFL); - signal(SIGINT, SIG_DFL); - signal(SIGTERM, SIG_DFL); - signal(SIGHUP, SIG_DFL); - signal(SIGQUIT, SIG_DFL); - signal(SIGCONT, SIG_DFL); - signal(SIGSTOP, SIG_DFL); - signal(SIGTSTP, SIG_DFL); + bb_signals(0 + + (1 << SIGUSR1) + + (1 << SIGUSR2) + + (1 << SIGINT) + + (1 << SIGTERM) + + (1 << SIGHUP) + + (1 << SIGQUIT) + + (1 << SIGCONT) + + (1 << SIGSTOP) + + (1 << SIGTSTP) + , SIG_DFL); /* Create a new session and make ourself the process * group leader */ setsid(); /* Open the new terminal device */ - open_stdio_to_tty(a->terminal, 1 /* - exit if open fails*/); + open_stdio_to_tty(a->terminal, 1 /* - exit if open fails */); +// NB: do not enable unless you change vfork to fork above #ifdef BUT_RUN_ACTIONS_ALREADY_DOES_WAITING /* If the init Action requires us to wait, then force the * supplied terminal to be the controlling tty. */ - if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) { + if (a->action_type & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) { /* Now fork off another process to just hang around */ pid = fork(); if (pid < 0) { - message(L_LOG | L_CONSOLE, "Can't fork"); - _exit(1); + message(L_LOG | L_CONSOLE, "can't fork"); + _exit(EXIT_FAILURE); } if (pid > 0) { /* Parent - wait till the child is done */ - signal(SIGINT, SIG_IGN); - signal(SIGTSTP, SIG_IGN); - signal(SIGQUIT, SIG_IGN); + bb_signals(0 + + (1 << SIGINT) + + (1 << SIGTSTP) + + (1 << SIGQUIT) + , SIG_IGN); signal(SIGCHLD, SIG_DFL); waitfor(pid); /* See if stealing the controlling tty back is necessary */ if (tcgetpgrp(0) != getpid()) - _exit(0); + _exit(EXIT_SUCCESS); /* Use a temporary process to steal the controlling tty. */ pid = fork(); if (pid < 0) { - message(L_LOG | L_CONSOLE, "Can't fork"); - _exit(1); + message(L_LOG | L_CONSOLE, "can't fork"); + _exit(EXIT_FAILURE); } if (pid == 0) { setsid(); ioctl(0, TIOCSCTTY, 1); - _exit(0); + _exit(EXIT_SUCCESS); } waitfor(pid); - _exit(0); + _exit(EXIT_SUCCESS); } - /* Child - fall though to actually execute things */ } #endif - /* See if any special /bin/sh requiring characters are present */ - if (strpbrk(a->command, "~`!$^&*()=|\\{}[];\"'<>?") != NULL) { - cmd[0] = (char*)DEFAULT_SHELL; - cmd[1] = (char*)"-c"; - cmd[2] = strcat(strcpy(buf, "exec "), a->command); - cmd[3] = NULL; - } else { - /* Convert command (char*) into cmd (char**, one word per string) */ - strcpy(buf, a->command); - s = buf; - for (tmpCmd = buf, i = 0; (tmpCmd = strsep(&s, " \t")) != NULL;) { - if (*tmpCmd != '\0') { - cmd[i] = tmpCmd; - i++; - } - } - cmd[i] = NULL; - } - - cmdpath = cmd[0]; - - /* - * Interactive shells want to see a dash in argv[0]. This - * typically is handled by login, argv will be setup this - * way if a dash appears at the front of the command path - * (like "-/bin/sh"). - */ - if (*cmdpath == '-') { - /* skip over the dash */ - ++cmdpath; - -#ifdef WHY_WE_DO_THIS_SHELL_MUST_HANDLE_THIS_ITSELF - /* find the last component in the command pathname */ - s = bb_get_last_path_component_nostrip(cmdpath); - /* make a new argv[0] */ - cmd[0] = malloc(strlen(s) + 2); - if (cmd[0] == NULL) { - message(L_LOG | L_CONSOLE, bb_msg_memory_exhausted); - cmd[0] = cmdpath; - } else { - cmd[0][0] = '-'; - strcpy(cmd[0] + 1, s); - } -#endif - - /* _Attempt_ to make stdin a controlling tty. */ - if (ENABLE_FEATURE_INIT_SCTTY) - ioctl(0, TIOCSCTTY, 0 /*only try, don't steal*/); - } - - if (a->action & ASKFIRST) { + /* NB: on NOMMU we can't wait for input in child, so + * "askfirst" will work the same as "respawn". */ + if (BB_MMU && (a->action_type & ASKFIRST)) { static const char press_enter[] ALIGN1 = #ifdef CUSTOMIZED_BANNER #include CUSTOMIZED_BANNER @@ -439,58 +445,71 @@ static pid_t run(const struct init_action *a) */ messageD(L_LOG, "waiting for enter to start '%s'" "(pid %d, tty '%s')\n", - cmdpath, getpid(), a->terminal); - full_write(1, press_enter, sizeof(press_enter) - 1); - while (safe_read(0, &c, 1) == 1 && c != '\n') + a->command, getpid(), a->terminal); + full_write(STDOUT_FILENO, press_enter, sizeof(press_enter) - 1); + while (safe_read(STDIN_FILENO, &c, 1) == 1 && c != '\n') continue; } - /* Log the process name and args */ - message(L_LOG, "starting pid %d, tty '%s': '%s'", - getpid(), a->terminal, cmdpath); - if (ENABLE_FEATURE_INIT_COREDUMPS) { struct stat sb; if (stat(CORE_ENABLE_FLAG_FILE, &sb) == 0) { struct rlimit limit; - limit.rlim_cur = RLIM_INFINITY; limit.rlim_max = RLIM_INFINITY; setrlimit(RLIMIT_CORE, &limit); } } + /* Log the process name and args */ + message(L_LOG, "starting pid %d, tty '%s': '%s'", + getpid(), a->terminal, a->command); + /* Now run it. The new program will take over this PID, * so nothing further in init.c should be run. */ - BB_EXECVP(cmdpath, cmd); - + init_exec(a->command); /* We're still here? Some error happened. */ - message(L_LOG | L_CONSOLE, "Cannot run '%s': %s", - cmdpath, strerror(errno)); _exit(-1); } +static void delete_init_action(struct init_action *action) +{ + struct init_action *a, *b = NULL; + + for (a = init_action_list; a; b = a, a = a->next) { + if (a == action) { + if (b == NULL) { + init_action_list = a->next; + } else { + b->next = a->next; + } + free(a); + break; + } + } +} + /* Run all commands of a particular type */ -static void run_actions(int action) +static void run_actions(int action_type) { struct init_action *a, *tmp; for (a = init_action_list; a; a = tmp) { tmp = a->next; - if (a->action == action) { + if (a->action_type & action_type) { // Pointless: run() will error out if open of device fails. ///* a->terminal of "" means "init's console" */ //if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) { // //message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/); // delete_init_action(a); //} else - if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) { + if (a->action_type & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) { waitfor(run(a)); delete_init_action(a); - } else if (a->action & ONCE) { + } else if (a->action_type & ONCE) { run(a); delete_init_action(a); - } else if (a->action & (RESPAWN | ASKFIRST)) { + } else if (a->action_type & (RESPAWN | ASKFIRST)) { /* Only run stuff with pid==0. If they have * a pid, that means it is still running */ if (a->pid == 0) { @@ -504,40 +523,26 @@ static void run_actions(int action) static void init_reboot(unsigned long magic) { pid_t pid; - /* We have to fork here, since the kernel calls do_exit(0) in + /* We have to fork here, since the kernel calls do_exit(EXIT_SUCCESS) in * linux/kernel/sys.c, which can cause the machine to panic when * the init process is killed.... */ pid = vfork(); if (pid == 0) { /* child */ reboot(magic); - _exit(0); + _exit(EXIT_SUCCESS); } waitfor(pid); } static void kill_all_processes(void) { - sigset_t block_signals; - /* run everything to be run at "shutdown". This is done _prior_ * to killing everything, in case people wish to use scripts to * shut things down gracefully... */ run_actions(SHUTDOWN); /* first disable all our signals */ - sigfillset(&block_signals); - /*sigemptyset(&block_signals); - sigaddset(&block_signals, SIGHUP); - sigaddset(&block_signals, SIGQUIT); - sigaddset(&block_signals, SIGCHLD); - sigaddset(&block_signals, SIGUSR1); - sigaddset(&block_signals, SIGUSR2); - sigaddset(&block_signals, SIGINT); - sigaddset(&block_signals, SIGTERM); - sigaddset(&block_signals, SIGCONT); - sigaddset(&block_signals, SIGSTOP); - sigaddset(&block_signals, SIGTSTP);*/ - sigprocmask(SIG_BLOCK, &block_signals, NULL); + sigprocmask_allsigs(SIG_BLOCK); message(L_CONSOLE | L_LOG, "The system is going down NOW!"); @@ -558,12 +563,11 @@ static void kill_all_processes(void) static void halt_reboot_pwoff(int sig) { - const char *m; + const char *m = "halt"; int rb; kill_all_processes(); - m = "halt"; rb = RB_HALT_SYSTEM; if (sig == SIGTERM) { m = "reboot"; @@ -579,41 +583,24 @@ static void halt_reboot_pwoff(int sig) loop_forever(); } -/* Handler for HUP and QUIT - exec "restart" action, +/* Handler for QUIT - exec "restart" action, * else (no such action defined) do nothing */ -static void exec_restart_action(int sig ATTRIBUTE_UNUSED) +static void exec_restart_action(int sig UNUSED_PARAM) { - struct init_action *a, *tmp; - sigset_t unblock_signals; + struct init_action *a; - for (a = init_action_list; a; a = tmp) { - tmp = a->next; - if (a->action & RESTART) { + for (a = init_action_list; a; a = a->next) { + if (a->action_type & RESTART) { kill_all_processes(); /* unblock all signals (blocked in kill_all_processes()) */ - sigfillset(&unblock_signals); - /*sigemptyset(&unblock_signals); - sigaddset(&unblock_signals, SIGHUP); - sigaddset(&unblock_signals, SIGQUIT); - sigaddset(&unblock_signals, SIGCHLD); - sigaddset(&unblock_signals, SIGUSR1); - sigaddset(&unblock_signals, SIGUSR2); - sigaddset(&unblock_signals, SIGINT); - sigaddset(&unblock_signals, SIGTERM); - sigaddset(&unblock_signals, SIGCONT); - sigaddset(&unblock_signals, SIGSTOP); - sigaddset(&unblock_signals, SIGTSTP);*/ - sigprocmask(SIG_UNBLOCK, &unblock_signals, NULL); + sigprocmask_allsigs(SIG_UNBLOCK); /* Open the new terminal device */ open_stdio_to_tty(a->terminal, 0 /* - halt if open fails */); messageD(L_CONSOLE | L_LOG, "Trying to re-exec %s", a->command); - BB_EXECLP(a->command, a->command, NULL); - - message(L_CONSOLE | L_LOG, "Cannot run '%s': %s", - a->command, strerror(errno)); + init_exec(a->command); sleep(2); init_reboot(RB_HALT_SYSTEM); loop_forever(); @@ -621,35 +608,33 @@ static void exec_restart_action(int sig ATTRIBUTE_UNUSED) } } -static void ctrlaltdel_signal(int sig ATTRIBUTE_UNUSED) +static void ctrlaltdel_signal(int sig UNUSED_PARAM) { run_actions(CTRLALTDEL); } +/* The SIGCONT handler is set to record_signo(). + * It just sets bb_got_signal = SIGCONT. */ + /* The SIGSTOP & SIGTSTP handler */ -static void stop_handler(int sig ATTRIBUTE_UNUSED) +static void stop_handler(int sig UNUSED_PARAM) { int saved_errno = errno; - got_cont = 0; - while (!got_cont) + bb_got_signal = 0; + while (bb_got_signal == 0) pause(); errno = saved_errno; } -/* The SIGCONT handler */ -static void cont_handler(int sig ATTRIBUTE_UNUSED) +static void new_init_action(uint8_t action_type, const char *command, const char *cons) { - got_cont = 1; -} + struct init_action *a, *last; -static void new_init_action(uint8_t action, const char *command, const char *cons) -{ - struct init_action *new_action, *a, *last; - - if (strcmp(cons, bb_dev_null) == 0 && (action & ASKFIRST)) - return; +// Why? +// if (strcmp(cons, bb_dev_null) == 0 && (action & ASKFIRST)) +// return; /* Append to the end of the list */ for (a = last = init_action_list; a; a = a->next) { @@ -658,40 +643,23 @@ static void new_init_action(uint8_t action, const char *command, const char *con if ((strcmp(a->command, command) == 0) && (strcmp(a->terminal, cons) == 0) ) { - a->action = action; + a->action_type = action_type; return; } last = a; } - new_action = xzalloc(sizeof(struct init_action)); + a = xzalloc(sizeof(*a)); if (last) { - last->next = new_action; + last->next = a; } else { - init_action_list = new_action; + init_action_list = a; } - strcpy(new_action->command, command); - new_action->action = action; - strcpy(new_action->terminal, cons); + a->action_type = action_type; + safe_strncpy(a->command, command, sizeof(a->command)); + safe_strncpy(a->terminal, cons, sizeof(a->terminal)); messageD(L_LOG | L_CONSOLE, "command='%s' action=%d tty='%s'\n", - new_action->command, new_action->action, new_action->terminal); -} - -static void delete_init_action(struct init_action *action) -{ - struct init_action *a, *b = NULL; - - for (a = init_action_list; a; b = a, a = a->next) { - if (a == action) { - if (b == NULL) { - init_action_list = a->next; - } else { - b->next = a->next; - } - free(a); - break; - } - } + a->command, a->action_type, a->terminal); } /* NOTE that if CONFIG_FEATURE_USE_INITTAB is NOT defined, @@ -703,16 +671,15 @@ static void delete_init_action(struct init_action *action) */ static void parse_inittab(void) { - FILE *file; - char buf[INIT_BUFFS_SIZE]; - - if (ENABLE_FEATURE_USE_INITTAB) - file = fopen(INITTAB, "r"); - else - file = NULL; + char *token[4]; + /* order must correspond to SYSINIT..RESTART constants */ + static const char actions[] ALIGN1 = + "sysinit\0""respawn\0""askfirst\0""wait\0""once\0" + "ctrlaltdel\0""shutdown\0""restart\0"; + parser_t *parser = config_open2(INITTAB, fopen_for_read); /* No inittab file -- set up some default behavior */ - if (file == NULL) { + if (parser == NULL) { /* Reboot on Ctrl-Alt-Del */ new_init_action(CTRLALTDEL, "reboot", ""); /* Umount all filesystems on halt/reboot */ @@ -720,79 +687,50 @@ static void parse_inittab(void) /* Swapoff on halt/reboot */ if (ENABLE_SWAPONOFF) new_init_action(SHUTDOWN, "swapoff -a", ""); - /* Prepare to restart init when a HUP is received */ + /* Prepare to restart init when a QUIT is received */ new_init_action(RESTART, "init", ""); /* Askfirst shell on tty1-4 */ new_init_action(ASKFIRST, bb_default_login_shell, ""); +//TODO: VC_1 instead of ""? "" is console -> ctty problems -> angry users new_init_action(ASKFIRST, bb_default_login_shell, VC_2); new_init_action(ASKFIRST, bb_default_login_shell, VC_3); new_init_action(ASKFIRST, bb_default_login_shell, VC_4); /* sysinit */ new_init_action(SYSINIT, INIT_SCRIPT, ""); - return; } + /* optional_tty:ignored_runlevel:action:command + * Delims are not to be collapsed and need exactly 4 tokens + */ + while (config_read(parser, token, 4, 0, "#:", + PARSE_NORMAL & ~(PARSE_TRIM | PARSE_COLLAPSE))) { + int action; + char *tty = token[0]; - while (fgets(buf, INIT_BUFFS_SIZE, file) != NULL) { - static const char actions[] = - STR_SYSINIT "sysinit\0" - STR_RESPAWN "respawn\0" - STR_ASKFIRST "askfirst\0" - STR_WAIT "wait\0" - STR_ONCE "once\0" - STR_CTRLALTDEL "ctrlaltdel\0" - STR_SHUTDOWN "shutdown\0" - STR_RESTART "restart\0" - ; - char tmpConsole[CONSOLE_NAME_SIZE]; - char *id, *runlev, *action, *command; - const char *a; - - /* Skip leading spaces */ - id = skip_whitespace(buf); - /* Skip the line if it's a comment */ - if (*id == '#' || *id == '\n') - continue; - /* Trim the trailing '\n' */ - *strchrnul(id, '\n') = '\0'; - - /* Line is: "id:runlevel_ignored:action:command" */ - runlev = strchr(id, ':'); - if (runlev == NULL /*|| runlev[1] == '\0' - not needed */) - goto bad_entry; - action = strchr(runlev + 1, ':'); - if (action == NULL /*|| action[1] == '\0' - not needed */) + if (!token[3]) /* less than 4 tokens */ goto bad_entry; - command = strchr(action + 1, ':'); - if (command == NULL || command[1] == '\0') + action = index_in_strings(actions, token[2]); + if (action < 0 || !token[3][0]) /* token[3]: command */ goto bad_entry; - - *command = '\0'; /* action => ":action\0" now */ - for (a = actions; a[0]; a += strlen(a) + 1) { - if (strcmp(a + 1, action + 1) == 0) { - *runlev = '\0'; - if (*id != '\0') { - if (strncmp(id, "/dev/", 5) == 0) - id += 5; - strcpy(tmpConsole, "/dev/"); - safe_strncpy(tmpConsole + 5, id, - sizeof(tmpConsole) - 5); - id = tmpConsole; - } - new_init_action((uint8_t)a[0], command + 1, id); - goto next_line; - } + /* turn .*TTY -> /dev/TTY */ + if (tty[0]) { + if (strncmp(tty, "/dev/", 5) == 0) + tty += 5; + tty = concat_path_file("/dev/", tty); } - *command = ':'; - /* Choke on an unknown action */ + new_init_action(1 << action, token[3], tty); + if (tty[0]) + free(tty); + continue; bad_entry: - message(L_LOG | L_CONSOLE, "Bad inittab entry: %s", id); - next_line: ; + message(L_LOG | L_CONSOLE, "Bad inittab entry at line %d", + parser->lineno); } - fclose(file); + config_close(parser); } -static void reload_signal(int sig ATTRIBUTE_UNUSED) +#if ENABLE_FEATURE_USE_INITTAB +static void reload_signal(int sig UNUSED_PARAM) { struct init_action *a, *tmp; @@ -800,7 +738,7 @@ static void reload_signal(int sig ATTRIBUTE_UNUSED) /* disable old entrys */ for (a = init_action_list; a; a = a->next) { - a->action = ONCE; + a->action_type = ONCE; } parse_inittab(); @@ -809,20 +747,21 @@ static void reload_signal(int sig ATTRIBUTE_UNUSED) /* Be nice and send SIGTERM first */ for (a = init_action_list; a; a = a->next) { pid_t pid = a->pid; - if ((a->action & ONCE) && pid != 0) { + if ((a->action_type & ONCE) && pid != 0) { kill(pid, SIGTERM); } } #if CONFIG_FEATURE_KILL_DELAY - if (fork() == 0) { /* child */ + /* NB: parent will wait in NOMMU case */ + if ((BB_MMU ? fork() : vfork()) == 0) { /* child */ sleep(CONFIG_FEATURE_KILL_DELAY); for (a = init_action_list; a; a = a->next) { pid_t pid = a->pid; - if ((a->action & ONCE) && pid != 0) { + if ((a->action_type & ONCE) && pid != 0) { kill(pid, SIGKILL); } } - _exit(0); + _exit(EXIT_SUCCESS); } #endif } @@ -830,26 +769,27 @@ static void reload_signal(int sig ATTRIBUTE_UNUSED) /* remove unused entrys */ for (a = init_action_list; a; a = tmp) { tmp = a->next; - if ((a->action & (ONCE | SYSINIT | WAIT)) && a->pid == 0) { + if ((a->action_type & (ONCE | SYSINIT | WAIT)) && a->pid == 0) { delete_init_action(a); } } - run_actions(RESPAWN); + run_actions(RESPAWN | ASKFIRST); } +#endif int init_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int init_main(int argc, char **argv) +int init_main(int argc UNUSED_PARAM, char **argv) { struct init_action *a; pid_t wpid; die_sleep = 30 * 24*60*60; /* if xmalloc will ever die... */ - if (argc > 1 && !strcmp(argv[1], "-q")) { + if (argv[1] && !strcmp(argv[1], "-q")) { return kill(1, SIGHUP); } - if (!ENABLE_DEBUG_INIT) { + if (!DEBUG_INIT) { /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */ if (getpid() != 1 && (!ENABLE_FEATURE_INITRD || !strstr(applet_name, "linuxrc")) @@ -858,15 +798,18 @@ int init_main(int argc, char **argv) } /* Set up sig handlers -- be sure to * clear all of these in run() */ - signal(SIGHUP, exec_restart_action); signal(SIGQUIT, exec_restart_action); - signal(SIGUSR1, halt_reboot_pwoff); /* halt */ - signal(SIGUSR2, halt_reboot_pwoff); /* poweroff */ - signal(SIGTERM, halt_reboot_pwoff); /* reboot */ + bb_signals(0 + + (1 << SIGUSR1) /* halt */ + + (1 << SIGUSR2) /* poweroff */ + + (1 << SIGTERM) /* reboot */ + , halt_reboot_pwoff); signal(SIGINT, ctrlaltdel_signal); - signal(SIGCONT, cont_handler); - signal(SIGSTOP, stop_handler); - signal(SIGTSTP, stop_handler); + signal(SIGCONT, record_signo); + bb_signals(0 + + (1 << SIGSTOP) + + (1 << SIGTSTP) + , stop_handler); /* Turn off rebooting via CTL-ALT-DEL -- we get a * SIGINT on CAD so we can shut things down gracefully... */ @@ -876,16 +819,17 @@ int init_main(int argc, char **argv) /* Figure out where the default console should be */ console_init(); set_sane_term(); - chdir("/"); + xchdir("/"); setsid(); - { - const char *const *e; - /* Make sure environs is set to something sane */ - for (e = environment; *e; e++) - putenv((char *) *e); - } - if (argc > 1) setenv("RUNLEVEL", argv[1], 1); + /* Make sure environs is set to something sane */ + putenv((char *) "HOME=/"); + putenv((char *) bb_PATH_root_path); + putenv((char *) "SHELL=/bin/sh"); + putenv((char *) "USER=root"); /* needed? why? */ + + if (argv[1]) + xsetenv("RUNLEVEL", argv[1]); /* Hello world */ message(MAYBE_CONSOLE | L_LOG, "init started: %s", bb_banner); @@ -907,9 +851,10 @@ int init_main(int argc, char **argv) } /* Check if we are supposed to be in single user mode */ - if (argc > 1 + if (argv[1] && (!strcmp(argv[1], "single") || !strcmp(argv[1], "-s") || LONE_CHAR(argv[1], '1')) ) { + /* ??? shouldn't we set RUNLEVEL="b" here? */ /* Start a shell on console */ new_init_action(RESPAWN, bb_default_login_shell, ""); } else { @@ -931,9 +876,9 @@ int init_main(int argc, char **argv) BB_EXECVP(argv[0], argv); } else if (enforce > 0) { /* SELinux in enforcing mode but load_policy failed */ - message(L_CONSOLE, "Cannot load SELinux Policy. " + message(L_CONSOLE, "cannot load SELinux Policy. " "Machine is in enforcing mode. Halting now."); - exit(1); + exit(EXIT_FAILURE); } } #endif /* CONFIG_SELINUX */ @@ -956,18 +901,16 @@ int init_main(int argc, char **argv) run_actions(ONCE); /* Redefine SIGHUP to reread /etc/inittab */ - if (ENABLE_FEATURE_USE_INITTAB) - signal(SIGHUP, reload_signal); - else - signal(SIGHUP, SIG_IGN); +#if ENABLE_FEATURE_USE_INITTAB + signal(SIGHUP, reload_signal); +#else + signal(SIGHUP, SIG_IGN); +#endif /* Now run the looping stuff for the rest of forever */ while (1) { - /* run the respawn stuff */ - run_actions(RESPAWN); - - /* run the askfirst stuff */ - run_actions(ASKFIRST); + /* run the respawn/askfirst stuff */ + run_actions(RESPAWN | ASKFIRST); /* Don't consume all CPU time -- sleep a bit */ sleep(1); @@ -982,7 +925,7 @@ int init_main(int argc, char **argv) * restarted by run_actions() */ a->pid = 0; message(L_LOG, "process '%s' (pid %d) exited. " - "Scheduling it for restart.", + "Scheduling for restart.", a->command, wpid); } }