1 files changed, 11 insertions, 1 deletions

diff --git a/shell/hush.c b/shell/hush.c
index 927193450..e1d0ece29 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -91,6 +91,7 @@
 #if ENABLE_HUSH_CASE
 # include <fnmatch.h>
 #endif
+#include <sys/utsname.h> /* for setting $HOSTNAME */
 
 #include "busybox.h"  /* for APPLET_IS_NOFORK/NOEXEC */
 #include "unicode.h"
@@ -944,6 +945,7 @@ static const struct built_in_command bltins1[] = {
         BLTIN("source"   , builtin_source  , "Run commands in a file"),
 #endif
         BLTIN("trap"     , builtin_trap    , "Trap signals"),
+        BLTIN("true"     , builtin_true    , NULL),
         BLTIN("type"     , builtin_type    , "Show command type"),
         BLTIN("ulimit"   , shell_builtin_ulimit  , "Control resource limits"),
         BLTIN("umask"    , builtin_umask   , "Set file creation mask"),
@@ -7785,6 +7787,14 @@ int hush_main(int argc, char **argv)
 
         /* Export PWD */
         set_pwd_var(/*exp:*/ 1);
+
+#if ENABLE_HUSH_BASH_COMPAT
+        /* Set (but not export) HOSTNAME unless already set */
+        if (!get_local_var_value("HOSTNAME")) {
+                struct utsname uts;
+                uname(&uts);
+                set_local_var_from_halves("HOSTNAME", uts.nodename);
+        }
         /* bash also exports SHLVL and _,
          * and sets (but doesn't export) the following variables:
          * BASH=/bin/bash
@@ -7793,7 +7803,6 @@ int hush_main(int argc, char **argv)
          * HOSTTYPE=i386
          * MACHTYPE=i386-pc-linux-gnu
          * OSTYPE=linux-gnu
-         * HOSTNAME=<xxxxxxxxxx>
          * PPID=<NNNNN> - we also do it elsewhere
          * EUID=<NNNNN>
          * UID=<NNNNN>
@@ -7821,6 +7830,7 @@ int hush_main(int argc, char **argv)
          * PS2='> '
          * PS4='+ '
          */
+#endif
 
 #if ENABLE_FEATURE_EDITING
         G.line_input_state = new_line_input_t(FOR_SHELL);