diff options
Diffstat (limited to 'source/a/sysvinit/sysvinit.use_dev_initctl_not_run_initctl.diff')
| -rw-r--r-- | source/a/sysvinit/sysvinit.use_dev_initctl_not_run_initctl.diff | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/source/a/sysvinit/sysvinit.use_dev_initctl_not_run_initctl.diff b/source/a/sysvinit/sysvinit.use_dev_initctl_not_run_initctl.diff index 7b4ce9712..47c55cef7 100644 --- a/source/a/sysvinit/sysvinit.use_dev_initctl_not_run_initctl.diff +++ b/source/a/sysvinit/sysvinit.use_dev_initctl_not_run_initctl.diff @@ -1,5 +1,5 @@ ---- ./src/shutdown.c.orig 2019-02-24 17:26:33.000000000 -0600 -+++ ./src/shutdown.c 2019-03-01 14:09:18.632719995 -0600 +--- ./src/shutdown.c.orig 2019-06-15 12:02:34.000000000 -0500 ++++ ./src/shutdown.c 2019-06-16 22:04:35.734002893 -0500 @@ -192,7 +192,7 @@ /* @@ -9,8 +9,8 @@ */ memset(&sa, 0, sizeof(sa)); sa.sa_handler = alrm_handler; ---- ./src/Makefile.orig 2019-02-24 17:26:33.000000000 -0600 -+++ ./src/Makefile 2019-03-01 14:09:18.624719996 -0600 +--- ./src/Makefile.orig 2019-06-15 12:02:34.000000000 -0500 ++++ ./src/Makefile 2019-06-16 22:04:35.736002893 -0500 @@ -231,8 +231,8 @@ # # This part is skipped on Debian systems, the @@ -24,8 +24,8 @@ + rm -f /dev/initctl; \ + mknod -m 600 /dev/initctl p; fi endif ---- ./src/initreq.h.orig 2019-02-24 17:26:33.000000000 -0600 -+++ ./src/initreq.h 2019-03-01 14:09:18.630719995 -0600 +--- ./src/initreq.h.orig 2019-06-15 12:02:34.000000000 -0500 ++++ ./src/initreq.h 2019-06-16 22:04:35.737002893 -0500 @@ -1,5 +1,5 @@ /* - * initreq.h Interface to talk to init through /run/initctl. @@ -42,8 +42,8 @@ #endif #define INIT_MAGIC 0x03091969 ---- ./src/init.c.orig 2019-02-24 17:26:33.000000000 -0600 -+++ ./src/init.c 2019-03-01 14:09:18.629719995 -0600 +--- ./src/init.c.orig 2019-06-15 12:02:35.000000000 -0500 ++++ ./src/init.c 2019-06-16 22:04:35.742002893 -0500 @@ -146,7 +146,7 @@ int maxproclen; /* Maximal length of argv[0] with \0 */ struct utmp utproto; /* Only used for sizeof(utproto.ut_id) */ @@ -53,7 +53,7 @@ int did_boot = 0; /* Did we already do BOOT* stuff? */ int main(int, char **); -@@ -2382,13 +2382,13 @@ +@@ -2386,13 +2386,13 @@ int quit = 0; /* @@ -69,7 +69,7 @@ * is still the _same_ inode. */ if (pipe_fd >= 0) { -@@ -2402,7 +2402,7 @@ +@@ -2406,7 +2406,7 @@ } /* @@ -78,7 +78,7 @@ * if it is -2, then we leave it closed */ if (pipe_fd == -1) { -@@ -2711,7 +2711,7 @@ +@@ -2715,7 +2715,7 @@ } if (ISMEMBER(got_signals, SIGUSR1)) { /* @@ -87,7 +87,7 @@ */ INITDBG(L_VB, "got SIGUSR1"); if (pipe_fd) -@@ -2959,7 +2959,7 @@ +@@ -2963,7 +2963,7 @@ strerror(errno)); /* Open the fifo and write a command. */ @@ -96,8 +96,8 @@ SETSIG(sa, SIGALRM, signal_handler, 0); alarm(3); if ((fd = open(INIT_FIFO, O_WRONLY)) >= 0) { ---- ./doc/initctl.orig 2019-02-24 17:26:33.000000000 -0600 -+++ ./doc/initctl 2019-03-01 14:09:18.614719997 -0600 +--- ./doc/initctl.orig 2019-06-15 12:02:34.000000000 -0500 ++++ ./doc/initctl 2019-06-16 22:04:35.743002893 -0500 @@ -1,5 +1,5 @@ This document describes the communiction pipe set up by SysV init -at /run/initctl. This named pipe allows programs with the proper @@ -130,8 +130,8 @@ request a power-related shutdown or change the runlevel, like telinit would do. Most of the time there is no need to talk to init directly, but this gives us an extenable approach so init can be taught how to learn ---- ./doc/Install.orig 2019-02-24 17:26:33.000000000 -0600 -+++ ./doc/Install 2019-03-01 14:09:18.612719997 -0600 +--- ./doc/Install.orig 2019-06-15 12:02:34.000000000 -0500 ++++ ./doc/Install 2019-06-16 22:04:35.743002893 -0500 @@ -66,7 +66,7 @@ manual page on shutdown to find out more about this. @@ -141,8 +141,8 @@ There should be no problem using a read-only root file system If you use a Linux kernel > 1.3.66. Older kernels don't allow writing to a FIFO on a read-only file system. ---- ./man/init.8.orig 2019-02-24 17:26:33.000000000 -0600 -+++ ./man/init.8 2019-03-01 14:11:06.713711051 -0600 +--- ./man/init.8.orig 2019-06-15 12:02:34.000000000 -0500 ++++ ./man/init.8 2019-06-16 22:04:35.744002893 -0500 @@ -147,7 +147,7 @@ the letter \fBF\fP. .PP @@ -184,8 +184,8 @@ .fi .\"}}} .\"{{{ Warnings ---- ./man/initctl.5.orig 2019-02-24 17:26:33.000000000 -0600 -+++ ./man/initctl.5 2019-03-01 14:09:18.622719996 -0600 +--- ./man/initctl.5.orig 2019-06-15 12:02:34.000000000 -0500 ++++ ./man/initctl.5 2019-06-16 22:05:29.658002895 -0500 @@ -16,13 +16,13 @@ .\" .TH INITCTL 5 "April 13, 2018" "" "Linux System Administrator's Manual" @@ -220,9 +220,9 @@ is simplified and skips the error checking. A more comlpete example can be found in the shutdown.c program's init_setnv() function. -@@ -118,18 +118,18 @@ +@@ -117,18 +117,18 @@ + .sp - .RE .SH NOTES -Usually the /run/initctl pipe would only be used by low-level programs to +Usually the /dev/initctl pipe would only be used by low-level programs to @@ -242,7 +242,7 @@ signal. This closes the pipe and leaves it closed. This may be useful for making sure init is not keeping any files open. However, when the pipe is closed, init no longer receives signals, such as those sent by -@@ -137,12 +137,12 @@ +@@ -136,11 +136,11 @@ change its runlevel directly. The pipe may be re-opened by sending init (PID 1) the SIGUSR1 signal. .PP @@ -250,7 +250,6 @@ +If the /dev/initctl pipe is closed then it may still be possible to bring down the system using the shutdown command's -n flag, but this is not always clean and not recommended. - .RE .SH FILES -/run/initctl +/dev/initctl |