5 files changed, 81 insertions, 29 deletions

diff --git a/init/Config.src b/init/Config.src
index 590e29890..2cac3573e 100644
--- a/init/Config.src
+++ b/init/Config.src
@@ -89,6 +89,18 @@ config FEATURE_INITRD
           This does not apply to initramfs, which runs /init as PID 1 and
           requires no special support.
 
+config INIT_TERMINAL_TYPE
+        string "Initial terminal type"
+        default "linux"
+        depends on INIT
+        help
+          This is the initial value set by init for the TERM environment
+          variable. This variable is used by programs which make use of
+          extended terminal capabilities.
+
+          Note that on Linux, init attempts to detect serial terminal and
+          sets TERM to "vt102" if one is found.
+
 config HALT
         bool "poweroff, halt, and reboot"
         default y
diff --git a/init/bootchartd.c b/init/bootchartd.c
index dae2fe6e9..465a34979 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -45,12 +45,15 @@
 #include "libbb.h"
 /* After libbb.h, since it needs sys/types.h on some systems */
 #include <sys/utsname.h>
-#include <sys/mount.h>
-#ifndef MS_SILENT
-# define MS_SILENT      (1 << 15)
-#endif
-#ifndef MNT_DETACH
-# define MNT_DETACH 0x00000002
+
+#ifdef __linux__
+# include <sys/mount.h>
+# ifndef MS_SILENT
+#  define MS_SILENT      (1 << 15)
+# endif
+# ifndef MNT_DETACH
+#  define MNT_DETACH 0x00000002
+# endif
 #endif
 
 #define BC_VERSION_STR "0.8"
@@ -174,6 +177,7 @@ static char *make_tempdir(void)
         char template[] = "/tmp/bootchart.XXXXXX";
         char *tempdir = xstrdup(mkdtemp(template));
         if (!tempdir) {
+#ifdef __linux__
                 /* /tmp is not writable (happens when we are used as init).
                  * Try to mount a tmpfs, them cd and lazily unmount it.
                  * Since we unmount it at once, we can mount it anywhere.
@@ -191,6 +195,9 @@ static char *make_tempdir(void)
                 if (umount2(try_dir, MNT_DETACH) != 0) {
                         bb_perror_msg_and_die("can't %smount tmpfs", "un");
                 }
+#else
+                bb_perror_msg_and_die("can't create temporary directory");
+#endif
         } else {
                 xchdir(tempdir);
         }
diff --git a/init/halt.c b/init/halt.c
index f1bb2c4a8..abd801fda 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -8,7 +8,7 @@
  */
 
 #include "libbb.h"
-#include <sys/reboot.h>
+#include "reboot.h"
 
 #if ENABLE_FEATURE_WTMP
 #include <sys/utsname.h>
@@ -36,18 +36,6 @@ static void write_wtmp(void)
 #define write_wtmp() ((void)0)
 #endif
 
-#ifndef RB_HALT_SYSTEM
-#define RB_HALT_SYSTEM RB_HALT
-#endif
-
-#ifndef RB_POWERDOWN
-/* Stop system and switch power off if possible.  */
-# define RB_POWERDOWN   0x4321fedc
-#endif
-#ifndef RB_POWER_OFF
-# define RB_POWER_OFF RB_POWERDOWN
-#endif
-
 
 int halt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int halt_main(int argc UNUSED_PARAM, char **argv)
diff --git a/init/init.c b/init/init.c
index 2eb8f1a54..fa1af6d7c 100644
--- a/init/init.c
+++ b/init/init.c
@@ -12,13 +12,21 @@
 #include "libbb.h"
 #include <syslog.h>
 #include <paths.h>
-#include <sys/reboot.h>
 #include <sys/resource.h>
+#ifdef __linux__
 #include <linux/vt.h>
+#endif
 #if ENABLE_FEATURE_UTMP
 # include <utmp.h> /* DEAD_PROCESS */
 #endif
+#include "reboot.h" /* reboot() constants */
 
+/* Used only for sanitizing purposes in set_sane_term() below. On systems where
+ * the baud rate is stored in a separate field, we can safely disable them. */
+#ifndef CBAUD
+# define CBAUD 0
+# define CBAUDEX 0
+#endif
 
 /* Was a CONFIG_xxx option. A lot of people were building
  * not fully functional init by switching it on! */
@@ -89,13 +97,6 @@ static const char *log_console = VC_5;
 enum {
         L_LOG = 0x1,
         L_CONSOLE = 0x2,
-#ifndef RB_HALT_SYSTEM
-        RB_HALT_SYSTEM = 0xcdef0123, /* FIXME: this overflows enum */
-        RB_ENABLE_CAD = 0x89abcdef,
-        RB_DISABLE_CAD = 0,
-        RB_POWER_OFF = 0x4321fedc,
-        RB_AUTOBOOT = 0x01234567,
-#endif
 };
 
 /* Print a message to the specified device.
@@ -166,7 +167,9 @@ static void message(int where, const char *fmt, ...)
 
 static void console_init(void)
 {
+#ifdef VT_OPENQRY
         int vtno;
+#endif
         char *s;
 
         s = getenv("CONSOLE");
@@ -190,6 +193,7 @@ static void console_init(void)
         }
 
         s = getenv("TERM");
+#ifdef VT_OPENQRY
         if (ioctl(STDIN_FILENO, VT_OPENQRY, &vtno) != 0) {
                 /* Not a linux terminal, probably serial console.
                  * Force the TERM setting to vt102
@@ -198,8 +202,10 @@ static void console_init(void)
                         putenv((char*)"TERM=vt102");
                 if (!ENABLE_FEATURE_INIT_SYSLOG)
                         log_console = NULL;
-        } else if (!s)
-                putenv((char*)"TERM=linux");
+        } else
+#endif
+        if (!s)
+                putenv((char*)"TERM=" CONFIG_INIT_TERMINAL_TYPE);
 }
 
 /* Set terminal settings to reasonable defaults.
@@ -220,8 +226,10 @@ static void set_sane_term(void)
         tty.c_cc[VSTOP] = 19;   /* C-s */
         tty.c_cc[VSUSP] = 26;   /* C-z */
 
+#ifdef __linux__
         /* use line discipline 0 */
         tty.c_line = 0;
+#endif
 
         /* Make it be sane */
         tty.c_cflag &= CBAUD | CBAUDEX | CSIZE | CSTOPB | PARENB | PARODD;
@@ -709,10 +717,12 @@ static void restart_handler(int sig UNUSED_PARAM)
 
                 run_shutdown_and_kill_processes();
 
+#ifdef RB_ENABLE_CAD
                 /* Allow Ctrl-Alt-Del to reboot the system.
                  * This is how kernel sets it up for init, we follow suit.
                  */
                 reboot(RB_ENABLE_CAD); /* misnomer */
+#endif
 
                 if (open_stdio_to_tty(a->terminal)) {
                         dbg_message(L_CONSOLE, "Trying to re-exec %s", a->command);
@@ -855,9 +865,11 @@ int init_main(int argc UNUSED_PARAM, char **argv)
                 ) {
                         bb_show_usage();
                 }
+#ifdef RB_DISABLE_CAD
                 /* Turn off rebooting via CTL-ALT-DEL - we get a
                  * SIGINT on CAD so we can shut things down gracefully... */
                 reboot(RB_DISABLE_CAD); /* misnomer */
+#endif
         }
 
         /* Figure out where the default console should be */
@@ -880,6 +892,8 @@ int init_main(int argc UNUSED_PARAM, char **argv)
         message(L_CONSOLE | L_LOG, "init started: %s", bb_banner);
 #endif
 
+/* struct sysinfo is linux-specific */
+#ifdef __linux__
         /* Make sure there is enough memory to do something useful. */
         if (ENABLE_SWAPONOFF) {
                 struct sysinfo info;
@@ -895,6 +909,7 @@ int init_main(int argc UNUSED_PARAM, char **argv)
                         run_actions(SYSINIT);   /* wait and removing */
                 }
         }
+#endif
 
         /* Check if we are supposed to be in single user mode */
         if (argv[1]
diff --git a/init/reboot.h b/init/reboot.h
new file mode 100644
index 000000000..949763949
--- /dev/null
+++ b/init/reboot.h
@@ -0,0 +1,30 @@
+/*
+ * Definitions related to the reboot() system call,
+ * shared between init.c and halt.c.
+ */
+
+#include <sys/reboot.h>
+
+#ifndef RB_HALT_SYSTEM
+# if defined(__linux__)
+#  define RB_HALT_SYSTEM  0xcdef0123
+#  define RB_ENABLE_CAD   0x89abcdef
+#  define RB_DISABLE_CAD  0
+#  define RB_POWER_OFF    0x4321fedc
+#  define RB_AUTOBOOT     0x01234567
+# elif defined(RB_HALT)
+#  define RB_HALT_SYSTEM  RB_HALT
+# endif
+#endif
+
+/* Stop system and switch power off if possible.  */
+#ifndef RB_POWER_OFF
+# if defined(RB_POWERDOWN)
+#  define RB_POWER_OFF  RB_POWERDOWN
+# elif defined(__linux__)
+#  define RB_POWER_OFF  0x4321fedc
+# else
+#  warning "poweroff unsupported, using halt as fallback"
+#  define RB_POWER_OFF  RB_HALT_SYSTEM
+# endif
+#endif