When mounting a ro fs rw, print warning and then mount it ro. Patch
[oweals/busybox.git] / init.c
diff --git a/init.c b/init.c
index 35f2255b5a48b50f71f5a7c864db5aa7b1f7c7e1..8d2d1b2352811c1b7319b783e9c0ae9cfd136b60 100644 (file)
--- a/init.c
+++ b/init.c
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
-#include <asm/types.h>
-#include <linux/serial.h>              /* for serial_struct */
-#include <linux/version.h>
-#include <linux/reboot.h>
-#include <linux/unistd.h>
-#include <linux/vt.h>                          /* for vt_stat */
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 # include <sys/syslog.h>
 #endif
 
+#define bb_need_full_version
+#define BB_DECLARE_EXTERN
+#include "messages.c"
+
+/* From <linux/vt.h> */
+struct vt_stat {
+       unsigned short v_active;        /* active vt */
+       unsigned short v_signal;        /* signal to send */
+       unsigned short v_state;         /* vt bitmask */
+};
+#define VT_GETSTATE     0x5603  /* get global vt state info */
+
+/* From <linux/serial.h> */
+struct serial_struct {
+       int     type;
+       int     line;
+       int     port;
+       int     irq;
+       int     flags;
+       int     xmit_fifo_size;
+       int     custom_divisor;
+       int     baud_base;
+       unsigned short  close_delay;
+       char    reserved_char[2];
+       int     hub6;
+       unsigned short  closing_wait; /* time to wait before closing */
+       unsigned short  closing_wait2; /* no longer used... */
+       int     reserved[4];
+};
+
+
 
 #ifndef RB_HALT_SYSTEM
 #define RB_HALT_SYSTEM  0xcdef0123
 #include <sys/time.h>
 #endif
 
-#ifndef KERNEL_VERSION
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-#endif
 
 #if defined(__GLIBC__)
 #include <sys/kdaemon.h>
@@ -97,10 +120,12 @@ static _syscall2(int, bdflush, int, func, int, data);
 
 #define VT_PRIMARY   "/dev/tty1"     /* Primary virtual console */
 #define VT_SECONDARY "/dev/tty2"     /* Virtual console */
-#define VT_LOG       "/dev/tty3"     /* Virtual console */
+#define VT_THIRD     "/dev/tty3"     /* Virtual console */
+#define VT_FOURTH    "/dev/tty4"     /* Virtual console */
+#define VT_LOG       "/dev/tty5"     /* Virtual console */
 #define SERIAL_CON0  "/dev/ttyS0"    /* Primary serial console */
 #define SERIAL_CON1  "/dev/ttyS1"    /* Serial console */
-#define SHELL        "/bin/sh"      /* Default shell */
+#define SHELL        "-/bin/sh"             /* Default shell */
 #define INITTAB      "/etc/inittab"  /* inittab file location */
 #ifndef INIT_SCRIPT
 #define INIT_SCRIPT  "/etc/init.d/rcS"   /* Default sysinit script. */
@@ -132,7 +157,7 @@ static const struct initActionType actions[] = {
        {"wait", WAIT},
        {"once", ONCE},
        {"ctrlaltdel", CTRLALTDEL},
-       {0}
+       {0, 0}
 };
 
 /* Set up a linked list of initActions, to be read from inittab */
@@ -148,6 +173,8 @@ initAction *initActionList = NULL;
 
 
 static char *secondConsole = VT_SECONDARY;
+static char *thirdConsole  = VT_THIRD;
+static char *fourthConsole = VT_FOURTH;
 static char *log           = VT_LOG;
 static int  kernelVersion  = 0;
 static char termType[32]   = "TERM=linux";
@@ -224,8 +251,6 @@ static void message(int device, char *fmt, ...)
        }
 }
 
-#define CTRLCHAR(ch)   ((ch)-0x40)
-
 /* Set terminal settings to reasonable defaults */
 void set_term(int fd)
 {
@@ -234,14 +259,14 @@ void set_term(int fd)
        tcgetattr(fd, &tty);
 
        /* set control chars */
-       tty.c_cc[VINTR]  = CTRLCHAR('C');       /* Ctrl-C */
-       tty.c_cc[VQUIT]  = CTRLCHAR('\\');      /* Ctrl-\ */
-       tty.c_cc[VERASE] = CTRLCHAR('?');       /* Ctrl-? */
-       tty.c_cc[VKILL]  = CTRLCHAR('U');       /* Ctrl-U */
-       tty.c_cc[VEOF]   = CTRLCHAR('D');       /* Ctrl-D */
-       tty.c_cc[VSTART] = CTRLCHAR('Q');       /* Ctrl-Q */
-       tty.c_cc[VSTOP]  = CTRLCHAR('S');       /* Ctrl-S */
-       tty.c_cc[VSUSP]  = CTRLCHAR('Z');       /* Ctrl-Z */
+       tty.c_cc[VINTR]  = 3;   /* C-c */
+       tty.c_cc[VQUIT]  = 28;  /* C-\ */
+       tty.c_cc[VERASE] = 127; /* C-? */
+       tty.c_cc[VKILL]  = 21;  /* C-u */
+       tty.c_cc[VEOF]   = 4;   /* C-d */
+       tty.c_cc[VSTART] = 17;  /* C-q */
+       tty.c_cc[VSTOP]  = 19;  /* C-s */
+       tty.c_cc[VSUSP]  = 26;  /* C-z */
 
        /* use line dicipline 0 */
        tty.c_line = 0;
@@ -275,20 +300,17 @@ static int check_free_memory()
                printf("Error checking free memory: %s\n", strerror(errno));
                return -1;
        }
+       /* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
        if (info.mem_unit==0) {
-               /* Looks like we have a kernel prior to Linux 2.4.x */
-               info.mem_unit=1024;
-               info.totalram/=info.mem_unit;
-               info.totalswap/=info.mem_unit;
-       } else {
-               /* Bah. Linux 2.4.x completely changed sysinfo. This can in theory
-               overflow a 32 bit unsigned long, but who puts more then 4GiB ram+swap
-               on an embedded system? */
-               info.mem_unit/=1024;
-               info.totalram*=info.mem_unit;
-               info.totalswap*=info.mem_unit;
+               info.mem_unit=1;
        }
-
+       info.mem_unit*=1024;
+       
+       /* Note:  These values can in theory overflow a 32 bit unsigned long (i.e.
+        * mem >=  Gib), but who puts more then 4GiB ram+swap on an embedded
+        * system? */
+       info.totalram/=info.mem_unit; 
+       info.totalswap/=info.mem_unit;
        return(info.totalram+info.totalswap);
 }
 
@@ -353,11 +375,13 @@ static void console_init()
                /* Perhaps we should panic here? */
                snprintf(console, sizeof(console) - 1, "/dev/null");
        } else {
-               /* check for serial console and disable logging to tty3 & running a
-                  * shell to tty2 */
+               /* check for serial console and disable logging to tty5 & running a
+                  * shell to tty2-4 */
                if (ioctl(0, TIOCGSERIAL, &sr) == 0) {
                        log = NULL;
                        secondConsole = NULL;
+                       thirdConsole = NULL;
+                       fourthConsole = NULL;
                        /* Force the TERM setting to vt102 for serial console --
                         * iff TERM is set to linux (the default) */
                        if (strcmp( termType, "TERM=linux" ) == 0)
@@ -375,7 +399,7 @@ static pid_t run(char *command, char *terminal, int get_enter)
        int i, fd;
        pid_t pid;
        char *tmpCmd;
-       char *cmd[255];
+        char *cmd[255], *cmdpath;
        char buf[255];
        static const char press_enter[] =
 
@@ -389,9 +413,9 @@ static pid_t run(char *command, char *terminal, int get_enter)
                0
        };
 
-
        if ((pid = fork()) == 0) {
                /* Clean up */
+               ioctl(0, TIOCNOTTY, 0);
                close(0);
                close(1);
                close(2);
@@ -411,7 +435,7 @@ static pid_t run(char *command, char *terminal, int get_enter)
                dup2(fd, 0);
                dup2(fd, 1);
                dup2(fd, 2);
-               ioctl(0, TIOCSCTTY, 0);
+               ioctl(0, TIOCSCTTY, 1);
                tcsetpgrp(0, getpgrp());
                set_term(0);
 
@@ -424,14 +448,13 @@ static pid_t run(char *command, char *terminal, int get_enter)
                         * be allowed to start a shell or whatever an init script 
                         * specifies.
                         */
-                       char c;
 #ifdef DEBUG_INIT
                        pid_t shell_pgid = getpid();
                        message(LOG, "Waiting for enter to start '%s' (pid %d, console %s)\r\n",
                                        command, shell_pgid, terminal);
 #endif
                        write(fileno(stdout), press_enter, sizeof(press_enter) - 1);
-                       read(fileno(stdin), &c, 1);
+                       getc(stdin);
                }
 
 #ifdef DEBUG_INIT
@@ -461,6 +484,34 @@ static pid_t run(char *command, char *terminal, int get_enter)
                        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 == '-') {
+                       char *s;
+
+                       /* skip over the dash */
+                         ++cmdpath;
+
+                       /* find the last component in the command pathname */
+                                                s = get_last_path_component(cmdpath);
+
+                       /* make a new argv[0] */
+                       if ((cmd[0] = malloc(strlen(s)+2)) == NULL) {
+                               message(LOG | CONSOLE, "malloc failed");
+                               cmd[0] = cmdpath;
+                       } else {
+                               cmd[0][0] = '-';
+                               strcpy(cmd[0]+1, s);
+                       }
+               }
+
 #if defined BB_FEATURE_INIT_COREDUMPS
                {
                        struct stat sb;
@@ -475,11 +526,11 @@ static pid_t run(char *command, char *terminal, int get_enter)
 
                /* Now run it.  The new program will take over this PID, 
                 * so nothing further in init.c should be run. */
-               execve(cmd[0], cmd, environment);
+                execve(cmdpath, cmd, environment);
 
-               /* We're still here?  Some error happened. */
-               message(LOG | CONSOLE, "Bummer, could not run '%s': %s\n", cmd[0],
-                               strerror(errno));
+                /* We're still here?  Some error happened. */
+                message(LOG | CONSOLE, "Bummer, could not run '%s': %s\n", cmdpath,
+                                strerror(errno));
                exit(-1);
        }
        return pid;
@@ -568,7 +619,7 @@ static void shutdown_system(void)
        run_lastAction();
 
        sync();
-       if (kernelVersion > 0 && kernelVersion <= 2 * 65536 + 2 * 256 + 11) {
+       if (kernelVersion > 0 && kernelVersion <= KERNEL_VERSION(2,2,11)) {
                /* bdflush, kupdate not needed for kernels >2.2.11 */
                bdflush(1, 0);
                sync();
@@ -587,11 +638,9 @@ static void halt_signal(int sig)
        /* allow time for last message to reach serial console */
        sleep(2);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
-       if (sig == SIGUSR2)
+       if (sig == SIGUSR2 && kernelVersion >= KERNEL_VERSION(2,2,0))
                init_reboot(RB_POWER_OFF);
        else
-#endif
                init_reboot(RB_HALT_SYSTEM);
        exit(0);
 }
@@ -769,14 +818,20 @@ void parse_inittab(void)
                /* No inittab file -- set up some default behavior */
 #endif
                /* Swapoff on halt/reboot */
-               new_initAction(CTRLALTDEL, "/sbin/swapoff -a > /dev/null 2>&1", console);
+               new_initAction(CTRLALTDEL, "/sbin/swapoff -a", console);
                /* Umount all filesystems on halt/reboot */
-               new_initAction(CTRLALTDEL, "/bin/umount -a -r > /dev/null 2>&1", console);
+               new_initAction(CTRLALTDEL, "/bin/umount -a -r", console);
                /* Askfirst shell on tty1 */
                new_initAction(ASKFIRST, SHELL, console);
                /* Askfirst shell on tty2 */
                if (secondConsole != NULL)
                        new_initAction(ASKFIRST, SHELL, secondConsole);
+               /* Askfirst shell on tty3 */
+               if (thirdConsole != NULL)
+                       new_initAction(ASKFIRST, SHELL, thirdConsole);
+               /* Askfirst shell on tty4 */
+               if (fourthConsole != NULL)
+                       new_initAction(ASKFIRST, SHELL, fourthConsole);
                /* sysinit */
                new_initAction(SYSINIT, INIT_SCRIPT, console);
 
@@ -876,7 +931,7 @@ extern int init_main(int argc, char **argv)
        /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */
        if (getpid() != 1
 #ifdef BB_FEATURE_LINUXRC
-                       && strstr(argv[0], "linuxrc") == NULL
+                       && strstr(applet_name, "linuxrc") == NULL
 #endif
                          )
        {
@@ -923,16 +978,14 @@ extern int init_main(int argc, char **argv)
                        CONSOLE|
 #endif
                        LOG,
-                       "init started:  BusyBox v%s (%s) multi-call binary\r\n",
-                       BB_VER, BB_BT);
+                       "init started:  %s\r\n", full_version);
 #else
        message(
 #if ! defined BB_FEATURE_EXTRA_QUIET
                        CONSOLE|
 #endif
                        LOG,
-                       "init(%d) started:  BusyBox v%s (%s) multi-call binary\r\n",
-                       getpid(), BB_VER, BB_BT);
+                       "init(%d) started:  %s\r\n", getpid(), full_version);
 #endif
 
 
@@ -942,9 +995,13 @@ extern int init_main(int argc, char **argv)
        /* Check if we are supposed to be in single user mode */
        if (argc > 1 && (!strcmp(argv[1], "single") ||
                                         !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) {
-               /* Ask first then start a shell on tty2 */
+               /* Ask first then start a shell on tty2-4 */
                if (secondConsole != NULL)
                        new_initAction(ASKFIRST, SHELL, secondConsole);
+               if (thirdConsole != NULL)
+                       new_initAction(ASKFIRST, SHELL, thirdConsole);
+               if (fourthConsole != NULL)
+                       new_initAction(ASKFIRST, SHELL, fourthConsole);
                /* Start a shell on tty1 */
                new_initAction(RESPAWN, SHELL, console);
        } else {