diff options
Diffstat (limited to 'system/sysvinit/utmpx.patch')
| -rw-r--r-- | system/sysvinit/utmpx.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/system/sysvinit/utmpx.patch b/system/sysvinit/utmpx.patch index e839a0834..195532b4c 100644 --- a/system/sysvinit/utmpx.patch +++ b/system/sysvinit/utmpx.patch @@ -10,7 +10,7 @@ diff -ur a/src/dowall.c b/src/dowall.c #include <pwd.h> #include <fcntl.h> #include <signal.h> -@@ -160,7 +160,7 @@ +@@ -161,7 +161,7 @@ { FILE *tp; struct sigaction sa; @@ -19,7 +19,7 @@ diff -ur a/src/dowall.c b/src/dowall.c time_t t; char term[UT_LINESIZE+ strlen(_PATH_DEV) + 1]; char line[256]; -@@ -217,9 +217,9 @@ +@@ -220,9 +220,9 @@ sigemptyset(&sa.sa_mask); sigaction(SIGALRM, &sa, NULL); @@ -31,7 +31,7 @@ diff -ur a/src/dowall.c b/src/dowall.c if(utmp->ut_type != USER_PROCESS || utmp->ut_user[0] == 0) continue; if (strncmp(utmp->ut_line, _PATH_DEV, strlen(_PATH_DEV)) == 0) { -@@ -253,7 +253,7 @@ +@@ -256,7 +256,7 @@ if (fd >= 0) close(fd); if (tp != NULL) fclose(tp); } @@ -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? */ -@@ -2332,12 +2328,6 @@ +@@ -2367,12 +2363,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, "~"); -@@ -2879,8 +2869,6 @@ +@@ -2914,8 +2904,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); -@@ -2894,13 +2882,6 @@ +@@ -2929,13 +2917,6 @@ setenv("PATH", PATH_DEFAULT, 1 /* Overwrite */); /* @@ -198,7 +198,7 @@ diff -ur a/src/shutdown.c b/src/shutdown.c #include <syslog.h> #include "paths.h" #include "reboot.h" -@@ -355,6 +351,9 @@ +@@ -358,6 +354,9 @@ for(i = 3; i < 20; i++) close(i); close(255); @@ -208,7 +208,7 @@ diff -ur a/src/shutdown.c b/src/shutdown.c /* First idle init. */ if (kill(1, SIGTSTP) < 0) { fprintf(stderr, "shutdown: can't idle init: %s.\r\n", strerror(errno)); -@@ -381,9 +380,6 @@ +@@ -384,9 +383,6 @@ /* Give init the chance to collect zombies. */ /* sleep(1); */ @@ -218,7 +218,7 @@ diff -ur a/src/shutdown.c b/src/shutdown.c /* This is for those who have quota installed. */ #if defined(ACCTON_OFF) # if (ACCTON_OFF > 1) && (_BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE < 500)) -@@ -514,7 +510,7 @@ +@@ -517,7 +513,7 @@ struct sigaction sa; struct tm *lt; struct stat st; @@ -227,7 +227,7 @@ diff -ur a/src/shutdown.c b/src/shutdown.c time_t t, target_time; char *halttype; char *downusers[32]; -@@ -634,7 +630,7 @@ +@@ -637,7 +633,7 @@ fclose(fp); /* Now walk through /var/run/utmp to find logged in users. */ @@ -236,7 +236,7 @@ diff -ur a/src/shutdown.c b/src/shutdown.c /* See if this is a user process on a VC. */ if (ut->ut_type != USER_PROCESS) continue; -@@ -660,7 +656,7 @@ +@@ -663,7 +659,7 @@ break; } } |