- fix conflicting initscript path fix patches

Changed files:
    sysvinit-man.patch -> 1.7
    sysvinit-paths.patch -> 1.11

diff --git a/sysvinit-man.patch b/sysvinit-man.patch
index 4d477ae854578be7cfdf79cb1ff13901a5092f1d..5774f83dfc3689f7553ca5ad67d2a87deba0b322 100644 (file)
--- a/sysvinit-man.patch
+++ b/sysvinit-man.patch
@@ -41,7 +41,7 @@ diff -Nru sysvinit-2.85.orig/man/init.8 sysvinit-2.85/man/init.8
  .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/etc/sysconfig/initscript\fP exists. If it does, it uses this script to
++\fI/etc/rc.d/rc.init\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
@@ -55,7 +55,7 @@ diff -Nru sysvinit-2.85.orig/man/init.8 sysvinit-2.85/man/init.8
  .nf
  /etc/inittab
 -/etc/initscript
-+/etc/sysconfig/initscript
++/etc/rc.d/rc.init
  /dev/console
 -/var/run/utmp
 -/var/log/wtmp
@@ -79,17 +79,17 @@ diff -Nru sysvinit-2.85.orig/man/initscript.5 sysvinit-2.85/man/initscript.5
  initscript \- script that executes inittab commands.
  .SH SYNOPSIS
 -/bin/sh /etc/initscript id runlevels action process
-+/bin/sh /etc/sysconfig/initscript id runlevels action process
++/bin/sh /etc/rc.d/rc.init id runlevels action process
  .SH DESCRIPTION
 -When the shell script \fI/etc/initscript\fP is present, \fBinit\fP
-+When the shell script \fI/etc/sysconfig/initscript\fP is present, \fBinit\fP
++When the shell script \fI/etc/rc.d/rc.init\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/etc/sysconfig/initscript.sample\fP.
++system as \fI/usr/share/doc/SysVinit-2.86/initscript.sample.gz\fP.
  .RS
  .sp
  .nf
@@ -98,7 +98,7 @@ diff -Nru sysvinit-2.85.orig/man/initscript.5 sysvinit-2.85/man/initscript.5
  #              wants to spawn like this:
  #
 -#              /bin/sh /etc/initscript <id> <level> <action> <process>
-+# /bin/sh /etc/sysconfig/initscript <id> <level> <action> <process>
++# /bin/sh /etc/rc.d/rc.init <id> <level> <action> <process>
  #
  
    # Set umask to safe level, and enable core dumps.
@@ -107,7 +107,7 @@ diff -Nru sysvinit-2.85.orig/man/initscript.5 sysvinit-2.85/man/initscript.5
  .SH FILES
  /etc/inittab,
 -/etc/initscript.
-+/etc/sysconfig/initscript.
++/etc/rc.d/rc.init
  .SH AUTHOR
  Miquel van Smoorenburg ,<miquels@cistron.nl>
  .SH "SEE ALSO"

diff --git a/sysvinit-paths.patch b/sysvinit-paths.patch
index 21f10a65e7d81c4ec62c4927120aa2c1aaf36cf0..d27f5c3450ccb08ccb5541a20c2595d3f246a8d3 100644 (file)
--- a/sysvinit-paths.patch
+++ b/sysvinit-paths.patch
@@ -69,58 +69,6 @@
    all programs that init starts (so that you can set a generic
    umask, ulimit eg for ALL processes - see initscript.sample).
  - A "sulogin" program added that always asks for the root
---- sysvinit-2.86/man/init.8~  2009-11-23 00:51:14.000000000 +0200
-+++ sysvinit-2.86/man/init.8   2009-11-23 00:57:22.862750944 +0200
-@@ -76,7 +76,7 @@
- are processed.
- .PP
- When starting a new process, \fBinit\fP first checks whether the file
--\fI/etc/sysconfig/initscript\fP exists. If it does, it uses this script to
-+\fI/etc/rc.d/rc.init\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/sysconfig/initscript
-+/etc/rc.d/rc.init
- /dev/console
- /var/run/utmpx
- /var/log/wtmpx
---- sysvinit-2.86/man/initscript.5~    2009-11-23 00:51:14.000000000 +0200
-+++ sysvinit-2.86/man/initscript.5     2009-11-23 00:58:47.190785642 +0200
-@@ -2,9 +2,9 @@
- .SH NAME
- initscript \- script that executes inittab commands.
- .SH SYNOPSIS
--/bin/sh /etc/sysconfig/initscript id runlevels action process
-+/bin/sh /etc/rc.d/rc.init id runlevels action process
- .SH DESCRIPTION
--When the shell script \fI/etc/sysconfig/initscript\fP is present, \fBinit\fP
-+When the shell script \fI/etc/rc.d/rc.init\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.
-@@ -20,7 +20,7 @@
- # initscript   Executed by init(8) for every program it
- #              wants to spawn like this:
- #
--# /bin/sh /etc/sysconfig/initscript <id> <level> <action> <process>
-+# /bin/sh /etc/rc.d/rc.init <id> <level> <action> <process>
- #
- 
-   # Set umask to safe level, and enable core dumps.
-@@ -48,7 +48,7 @@
- .RE
- .SH FILES
- /etc/inittab,
--/etc/sysconfig/initscript.
-+/etc/rc.d/rc.init.
- .SH AUTHOR
- Miquel van Smoorenburg ,<miquels@cistron.nl>
- .SH "SEE ALSO"
 --- sysvinit-2.86/src/initscript.sample~       1997-11-26 15:06:33.000000000 +0200
 +++ sysvinit-2.86/src/initscript.sample        2009-11-23 01:00:22.490804927 +0200
 @@ -1,14 +1,14 @@