diff options
Diffstat (limited to 'system/sysvinit/utmpx.patch')
| -rw-r--r-- | system/sysvinit/utmpx.patch | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/system/sysvinit/utmpx.patch b/system/sysvinit/utmpx.patch index d874f2e7c..e839a0834 100644 --- a/system/sysvinit/utmpx.patch +++ b/system/sysvinit/utmpx.patch @@ -43,7 +43,7 @@ diff -ur a/src/dowall.c b/src/dowall.c diff -ur a/src/halt.c b/src/halt.c --- a/src/halt.c 2022-05-04 08:18:19.100000000 +0000 +++ b/src/halt.c 2022-05-04 08:18:29.030000000 +0000 -@@ -47,7 +47,7 @@ +@@ -49,7 +49,7 @@ #include <sys/stat.h> #include <sys/param.h> #include <stdlib.h> @@ -52,7 +52,7 @@ diff -ur a/src/halt.c b/src/halt.c #include <fcntl.h> #include <string.h> #include <unistd.h> -@@ -95,7 +95,7 @@ +@@ -106,7 +106,7 @@ */ int get_runlevel(void) { @@ -61,7 +61,7 @@ diff -ur a/src/halt.c b/src/halt.c char *r; int runlevel, status; -@@ -123,8 +123,8 @@ +@@ -134,8 +134,8 @@ /* * Find runlevel in utmp. */ @@ -72,7 +72,7 @@ diff -ur a/src/halt.c b/src/halt.c #if RUNLVL_PICKY /* * Only accept value if it's from after boottime. -@@ -136,7 +136,7 @@ +@@ -147,7 +147,7 @@ return (ut->ut_pid & 255); #endif } @@ -96,7 +96,7 @@ diff -ur a/src/init.c b/src/init.c #include <ctype.h> #include <stdarg.h> #include <sys/ttydefaults.h> -@@ -149,7 +145,7 @@ +@@ -156,7 +152,7 @@ int sleep_time = WAIT_BETWEEN_SIGNALS; /* Sleep time between TERM and KILL */ char *argv0; /* First arguments; show up in ps listing */ int maxproclen; /* Maximal length of argv[0] with \0 */ @@ -105,7 +105,7 @@ diff -ur a/src/init.c b/src/init.c char *console_dev; /* Console device. */ int pipe_fd = -1; /* /run/initctl */ int did_boot = 0; /* Did we already do BOOT* stuff? */ -@@ -2322,12 +2318,6 @@ +@@ -2332,12 +2328,6 @@ static void redo_utmp_wtmp(void) { @@ -118,7 +118,7 @@ diff -ur a/src/init.c b/src/init.c if ((wrote_wtmp_reboot == 0) || (wrote_utmp_reboot == 0)) write_utmp_wtmp("reboot", "~~", 0, BOOT_TIME, "~"); -@@ -2862,8 +2852,6 @@ +@@ -2879,8 +2869,6 @@ console_init(); if (!reload) { @@ -127,7 +127,7 @@ diff -ur a/src/init.c b/src/init.c /* Close whatever files are open, and reset the console. */ close(0); close(1); -@@ -2877,13 +2865,6 @@ +@@ -2894,13 +2882,6 @@ setenv("PATH", PATH_DEFAULT, 1 /* Overwrite */); /* @@ -162,7 +162,8 @@ diff -ur a/src/runlevel.c b/src/runlevel.c char prev; int status, runlevel; - if (argc > 1) utmpname(argv[1]); +- if (argc > 1) utmpname(argv[1]); ++ if (argc > 1) utmpxname(argv[1]); - setutent(); - while ((ut = getutent()) != NULL) { |