summaryrefslogtreecommitdiffstats
path: root/source/a/sysvinit/sysvinit.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2009-08-26 10:00:38 -0500
committer Eric Hameleers <alien@slackware.com>2018-05-31 22:41:17 +0200
commit5a12e7c134274dba706667107d10d231517d3e05 (patch)
tree55718d5acb710fde798d9f38d0bbaf594ed4b296 /source/a/sysvinit/sysvinit.diff
downloadcurrent-5a12e7c134274dba706667107d10d231517d3e05.tar.gz
current-5a12e7c134274dba706667107d10d231517d3e05.tar.xz
Slackware 13.0slackware-13.0
Wed Aug 26 10:00:38 CDT 2009 Slackware 13.0 x86_64 is released as stable! Thanks to everyone who helped make this release possible -- see the RELEASE_NOTES for the credits. The ISOs are off to the replicator. This time it will be a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. We're taking pre-orders now at store.slackware.com. Please consider picking up a copy to help support the project. Once again, thanks to the entire Slackware community for all the help testing and fixing things and offering suggestions during this development cycle. As always, have fun and enjoy! -P.
Diffstat (limited to 'source/a/sysvinit/sysvinit.diff')
-rw-r--r--source/a/sysvinit/sysvinit.diff125
1 files changed, 125 insertions, 0 deletions
diff --git a/source/a/sysvinit/sysvinit.diff b/source/a/sysvinit/sysvinit.diff
new file mode 100644
index 000000000..11477be72
--- /dev/null
+++ b/source/a/sysvinit/sysvinit.diff
@@ -0,0 +1,125 @@
+diff -Naur sysvinit-2.86.orig/man/init.8 sysvinit-2.86/man/init.8
+--- sysvinit-2.86.orig/man/init.8 2004-07-29 13:21:31.000000000 +0200
++++ sysvinit-2.86/man/init.8 2007-12-23 12:22:51.000000000 +0100
+@@ -76,7 +76,7 @@
+ are processed.
+ .PP
+ When starting a new process, \fBinit\fP first checks whether the file
+-\fI/etc/initscript\fP exists. If it does, it uses this script to
++\fI/sbin/initscript\fP exists. If it does, it uses this script to
+ start the process.
+ .PP
+ Each time a child terminates, \fBinit\fP records the fact and the reason
+@@ -240,7 +240,7 @@
+ .SH FILES
+ .nf
+ /etc/inittab
+-/etc/initscript
++/sbin/initscript
+ /dev/console
+ /var/run/utmp
+ /var/log/wtmp
+diff -Naur sysvinit-2.86.orig/man/initscript.5 sysvinit-2.86/man/initscript.5
+--- sysvinit-2.86.orig/man/initscript.5 2004-06-09 14:47:45.000000000 +0200
++++ sysvinit-2.86/man/initscript.5 2007-12-23 12:22:51.000000000 +0100
+@@ -2,15 +2,15 @@
+ .SH NAME
+ initscript \- script that executes inittab commands.
+ .SH SYNOPSIS
+-/bin/sh /etc/initscript id runlevels action process
++/bin/sh /sbin/initscript id runlevels action process
+ .SH DESCRIPTION
+-When the shell script \fI/etc/initscript\fP is present, \fBinit\fP
++When the shell script \fI/sbin/initscript\fP is present, \fBinit\fP
+ will use it to execute the commands from \fIinittab\fP.
+ This script can be used to set things like \fBulimit\fP and
+ \fBumask\fP default values for every process.
+ .SH EXAMPLES
+ This is a sample initscript, which might be installed on your
+-system as \fI/etc/initscript.sample\fP.
++system as \fI/sbin/initscript.sample\fP.
+ .RS
+ .sp
+ .nf
+@@ -20,7 +20,7 @@
+ # initscript Executed by init(8) for every program it
+ # wants to spawn like this:
+ #
+-# /bin/sh /etc/initscript <id> <level> <action> <process>
++# /bin/sh /sbin/initscript <id> <level> <action> <process>
+ #
+
+ # Set umask to safe level, and enable core dumps.
+@@ -48,7 +48,7 @@
+ .RE
+ .SH FILES
+ /etc/inittab,
+-/etc/initscript.
++/sbin/initscript.
+ .SH AUTHOR
+ Miquel van Smoorenburg ,<miquels@cistron.nl>
+ .SH "SEE ALSO"
+diff -Naur sysvinit-2.86.orig/src/Makefile sysvinit-2.86/src/Makefile
+--- sysvinit-2.86.orig/src/Makefile 2004-06-09 14:47:45.000000000 +0200
++++ sysvinit-2.86/src/Makefile 2007-12-23 12:22:51.000000000 +0100
+@@ -11,7 +11,7 @@
+ CC = gcc
+ CFLAGS = -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE
+ LDFLAGS = -s
+-STATIC =
++STATIC = -static
+
+ # For some known distributions we do not build all programs, otherwise we do.
+ BIN =
+diff -Naur sysvinit-2.86.orig/src/initscript.sample sysvinit-2.86/src/initscript.sample
+--- sysvinit-2.86.orig/src/initscript.sample 1997-11-26 14:06:33.000000000 +0100
++++ sysvinit-2.86/src/initscript.sample 2007-12-23 12:22:51.000000000 +0100
+@@ -1,14 +1,14 @@
+ #
+-# initscript If this script is intalled as /etc/initscript,
++# initscript If this script is intalled as /sbin/initscript,
+ # it is executed by init(8) for every program it
+ # wants to spawn like this:
+ #
+-# /bin/sh /etc/initscript <id> <level> <action> <process>
++# /bin/sh /sbin/initscript <id> <level> <action> <process>
+ #
+ # It can be used to set the default umask and ulimit
+ # of all processes. By default this script is installed
+-# as /etc/initscript.sample, so to enable it you must
+-# rename this script first to /etc/initscript.
++# as /sbin/initscript.sample, so to enable it you must
++# rename this script first to /sbin/initscript.
+ #
+ # Version: @(#)initscript 1.10 10-Dec-1995 MvS.
+ #
+diff -Naur sysvinit-2.86.orig/src/paths.h sysvinit-2.86/src/paths.h
+--- sysvinit-2.86.orig/src/paths.h 2004-06-09 14:47:45.000000000 +0200
++++ sysvinit-2.86/src/paths.h 2007-12-23 12:23:50.000000000 +0100
+@@ -20,21 +20,21 @@
+ #define INITTAB "/etc/inittab" /* Location of inittab */
+ #define INIT "/sbin/init" /* Location of init itself. */
+ #define NOLOGIN "/etc/nologin" /* Stop user logging in. */
+-#define FASTBOOT "/fastboot" /* Enable fast boot. */
+-#define FORCEFSCK "/forcefsck" /* Force fsck on boot */
++#define FASTBOOT "/etc/fastboot" /* Enable fast boot. */
++#define FORCEFSCK "/etc/forcefsck" /* Force fsck on boot */
+ #define SDPID "/var/run/shutdown.pid" /* PID of shutdown program */
+ #define SHELL "/bin/sh" /* Default shell */
+ #define SULOGIN "/sbin/sulogin" /* Sulogin */
+-#define INITSCRIPT "/etc/initscript" /* Initscript. */
++#define INITSCRIPT "/sbin/initscript" /* Initscript. */
+ #define PWRSTAT "/etc/powerstatus" /* COMPAT: SIGPWR reason (OK/BAD) */
+
+ #if 0
+ #define INITLVL "/etc/initrunlvl" /* COMPAT: New runlevel */
+ #define INITLVL2 "/var/log/initrunlvl" /* COMPAT: New runlevel */
+ /* Note: INITLVL2 definition needs INITLVL */
+-#define HALTSCRIPT1 "/etc/init.d/halt" /* Called by "fast" shutdown */
++#define HALTSCRIPT1 "/etc/init.d/rc.halt" /* Called by "fast" shutdown */
+ #define HALTSCRIPT2 "/etc/rc.d/rc.0" /* Called by "fast" shutdown */
+-#define REBOOTSCRIPT1 "/etc/init.d/reboot" /* Ditto. */
++#define REBOOTSCRIPT1 "/etc/init.d/rc.reboot" /* Ditto. */
+ #define REBOOTSCRIPT2 "/etc/rc.d/rc.6" /* Ditto. */
+ #endif
+