Skip to contentSkip to conversation

99base/init: honor env. vars provided by kernel (PATH, HOME and TERM)

PATCH In review Amadeusz Żołnowski 2 participants 2 messages Sep 25, 2010 – Oct 1, 2010 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 99base/init: honor env. vars provided by kernel (PATH, HOME and TERM)

Let take a look at Linux sources, /usr/src/linux-2.6.35/init/main.c:

  204: char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };

  857: run_init_process("/sbin/init");

  817: static void run_init_process(char *init_filename)
  818: {
  819:        argv_init[0] = init_filename;
  820:        kernel_execve(init_filename, argv_init, envp_init);
  821: }

As we can see HOME=/ and TERM=linux are provided for init and this might be expected on some systems (Gentoo comes to my mind, here ;-)). That's why we should give to init the same set of env. vars as Linux kernel does.

---
 modules.d/99base/init |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
modules.d/99base/init +3 -3
index 5a02ade..dc0a0df 100755
@@ -59,8 +59,8 @@ emergency_shell()
     fi
 }
 
+OLD_PATH="$PATH"
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
-export TERM=linux
 NEWROOT="/sysroot"
 
 trap "emergency_shell Signal caught!" 0
@@ -327,8 +327,8 @@ info "Switching root"
 wait_for_loginit
 
 umask $OLD_UMASK
-unset HOME
-unset TERM
+export PATH="$OLD_PATH"
+
 exec switch_root "$NEWROOT" "$INIT" $initargs || {
     echo "Something went very badly wrong in the initramfs.  Please "
     echo "file a bug against dracut."
Signature · 1 line
1.7.3

A message that is not in the archive (sent off-list or not yet received): 4c9e7524.9804cc0a.3175.65a0-ATjtLOhZ0NVl57MIdRCFDg@public.gmane.org

#2 lore raw
Quoted 34 lines · Amadeusz Żołnowski

Let take a look at Linux sources, /usr/src/linux-2.6.35/init/main.c:

   204: char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };

   857: run_init_process("/sbin/init");

   817: static void run_init_process(char *init_filename)
   818: {
   819:        argv_init[0] = init_filename;
   820:        kernel_execve(init_filename, argv_init, envp_init);
   821: }

As we can see HOME=/ and TERM=linux are provided for init and this might be expected on some systems (Gentoo comes to my mind, here ;-)). That's why we should give to init the same set of env. vars as Linux kernel does.

---
  modules.d/99base/init |    6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)
modules.d/99base/init +1 -1
index 5a02ade..dc0a0df 100755
@@ -59,8 +59,8 @@ emergency_shell()
      fi
  }
 
+OLD_PATH="$PATH"
  export PATH=/sbin:/bin:/usr/sbin:/usr/bin
-export TERM=linux
  NEWROOT="/sysroot"
 
  trap "emergency_shell Signal caught!" 0

modules.d/99base/init info "Switching root" · line 334

Quoted 10 lines
modules.d/99base/init +2 -2
@@ -327,8 +327,8 @@ info "Switching root"
  wait_for_loginit
 
  umask $OLD_UMASK
-unset HOME
-unset TERM
+export PATH="$OLD_PATH"
+
  exec switch_root "$NEWROOT" "$INIT" $initargs || {
      echo "Something went very badly wrong in the initramfs.  Please "
      echo "file a bug against dracut."

pushed