Set default envs like sysvinit and busybox does; TERM, LOGNAME, USER

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2021-05-30 13:22:50 +02:00
1 parent 9cc9e3ddbb
commit 25683221cc
2 files changed
+12 -3

No files matched your search

+10 -3
View File
@@ -34,6 +34,7 @@
#include <sys/ttydefaults.h> /* Not included by default in musl libc */ #include <sys/ttydefaults.h> /* Not included by default in musl libc */
#include <termios.h> #include <termios.h>
#include <lite/lite.h> #include <lite/lite.h>
#include <linux/vt.h>
#include "finit.h" #include "finit.h"
#include "cgroup.h" #include "cgroup.h"
@@ -240,7 +241,7 @@ int exec_runtask(char *cmd, char *args[])
static void prepare_tty(char *tty, speed_t speed, char *procname, struct rlimit rlimit[]) static void prepare_tty(char *tty, speed_t speed, char *procname, struct rlimit rlimit[])
{ {
char name[80]; char name[80];
int fd; int fd, dummy;
fd = open(tty, O_RDWR); fd = open(tty, O_RDWR);
if (fd < 0) { if (fd < 0) {
@@ -251,12 +252,18 @@ static void prepare_tty(char *tty, speed_t speed, char *procname, struct rlimit
dup2(fd, STDIN_FILENO); dup2(fd, STDIN_FILENO);
dup2(fd, STDOUT_FILENO); dup2(fd, STDOUT_FILENO);
dup2(fd, STDERR_FILENO); dup2(fd, STDERR_FILENO);
close(fd);
/* Set default TERM, run_getty() below allows override */
if (ioctl(fd, VT_OPENQRY, &dummy) == -1)
setenv("TERM", "vt102", 1); /* likely a serial line */
else
setenv("TERM", "linux", 1);
/* /*
* Reset to sane defaults in case of messup from prev. session * Reset to sane defaults in case of messup from prev. session
*/ */
stty(STDIN_FILENO, speed); stty(fd, speed);
close(fd);
/* Set configured limits */ /* Set configured limits */
for (int i = 0; i < RLIMIT_NLIMITS; i++) { for (int i = 0; i < RLIMIT_NLIMITS; i++) {
+2
View File
@@ -525,6 +525,8 @@ int main(int argc, char *argv[])
*/ */
setenv("PATH", _PATH_STDPATH, 1); setenv("PATH", _PATH_STDPATH, 1);
setenv("SHELL", _PATH_BSHELL, 1); setenv("SHELL", _PATH_BSHELL, 1);
setenv("LOGNAME", "root", 1);
setenv("USER", "root", 1);
if (chdir("/")) if (chdir("/"))
_pe("Failed cd /"); _pe("Failed cd /");