- refresh all patches with fuzz=0
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=14
This commit is contained in:
Git OBS Bridge
parent
782e8a1416
commit
50f51f372a
@ -1,6 +1,8 @@
|
||||
--- man/init.8
|
||||
+++ man/init.8 Fri Mar 12 12:44:29 2004
|
||||
@@ -232,7 +232,7 @@
|
||||
Index: man/init.8
|
||||
===================================================================
|
||||
--- man/init.8.orig
|
||||
+++ man/init.8
|
||||
@@ -232,7 +232,7 @@ It activates the \fIkbrequest\fP action.
|
||||
.SH CONFORMING TO
|
||||
\fBInit\fP is compatible with the System V init. It works closely
|
||||
together with the scripts in the directories
|
||||
@ -9,11 +11,13 @@
|
||||
If your system uses this convention, there should be a \fIREADME\fP
|
||||
file in the directory \fI/etc/init.d\fP explaining how these scripts work.
|
||||
.\"}}}
|
||||
--- src/paths.h
|
||||
+++ src/paths.h Fri Mar 12 12:45:00 2004
|
||||
@@ -25,10 +25,10 @@
|
||||
#define SDPID "/var/run/shutdown.pid" /* PID of shutdown program */
|
||||
Index: src/paths.h
|
||||
===================================================================
|
||||
--- src/paths.h.orig
|
||||
+++ src/paths.h
|
||||
@@ -26,10 +26,10 @@
|
||||
#define SHELL "/bin/sh" /* Default shell */
|
||||
#define SULOGIN "/sbin/sulogin" /* Sulogin */
|
||||
#define INITSCRIPT "/etc/initscript" /* Initscript. */
|
||||
-#define PWRSTAT "/etc/powerstatus" /* COMPAT: SIGPWR reason (OK/BAD) */
|
||||
+#define PWRSTAT "/var/run/powerstatus" /* COMPAT: SIGPWR reason (OK/BAD) */
|
||||
|
||||
@ -2,6 +2,8 @@
|
||||
src/killall5.c | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: src/killall5.c
|
||||
===================================================================
|
||||
--- src/killall5.c.orig
|
||||
+++ src/killall5.c
|
||||
@@ -62,6 +62,7 @@ typedef struct proc {
|
||||
@ -12,7 +14,7 @@
|
||||
struct proc *next; /* Pointer to next struct. */
|
||||
} PROC;
|
||||
|
||||
@@ -482,6 +483,9 @@ int readproc()
|
||||
@@ -609,6 +610,9 @@ int readproc()
|
||||
/* Check for uevent handler */
|
||||
p->isudev = (strncmp(buf, "/sbin/udevd", 11) == 0);
|
||||
|
||||
@ -22,9 +24,9 @@
|
||||
/* Check for provider of FUSE filesystems */
|
||||
p->isfuse = is_fuse(d->d_name);
|
||||
|
||||
@@ -819,11 +823,13 @@ int main(int argc, char **argv)
|
||||
exit(1);
|
||||
@@ -947,11 +951,13 @@ int main(int argc, char **argv)
|
||||
}
|
||||
clear_mnt();
|
||||
|
||||
- /* Now kill all processes except init (pid 1), our session, and FUSE filesystems. */
|
||||
+ /* Now kill all processes except init (pid 1), our session,
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
--- src/init.c
|
||||
+++ src/init.c 2005-10-19 12:01:15.000000000 +0200
|
||||
Index: src/init.c
|
||||
===================================================================
|
||||
--- src/init.c.orig
|
||||
+++ src/init.c
|
||||
@@ -20,6 +20,14 @@
|
||||
*
|
||||
*/
|
||||
@ -15,7 +17,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/ioctl.h>
|
||||
@@ -966,6 +974,7 @@
|
||||
@@ -976,6 +984,7 @@ int spawn(CHILD *ch, int *res)
|
||||
dup(f);
|
||||
dup(f);
|
||||
}
|
||||
@ -23,7 +25,7 @@
|
||||
if ((pid = fork()) < 0) {
|
||||
initlog(L_VB, "cannot fork");
|
||||
exit(1);
|
||||
@@ -978,7 +987,6 @@
|
||||
@@ -988,7 +997,6 @@ int spawn(CHILD *ch, int *res)
|
||||
SETSIG(sa, SIGINT, SIG_IGN, SA_RESTART);
|
||||
SETSIG(sa, SIGTSTP, SIG_IGN, SA_RESTART);
|
||||
SETSIG(sa, SIGQUIT, SIG_IGN, SA_RESTART);
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
--- src/init.c
|
||||
+++ src/init.c 2006-08-22 15:04:27.000000000 +0200
|
||||
@@ -115,6 +115,8 @@ sig_atomic_t got_signals; /* Set if we r
|
||||
Index: src/init.c
|
||||
===================================================================
|
||||
--- src/init.c.orig
|
||||
+++ src/init.c
|
||||
@@ -107,6 +107,8 @@ sig_atomic_t got_signals; /* Set if we r
|
||||
int emerg_shell = 0; /* Start emergency shell? */
|
||||
int wrote_wtmp_reboot = 1; /* Set when we wrote the reboot record */
|
||||
int wrote_utmp_reboot = 1; /* Set when we wrote the reboot record */
|
||||
@ -9,7 +11,7 @@
|
||||
int sltime = 5; /* Sleep time between TERM and KILL */
|
||||
char *argv0; /* First arguments; show up in ps listing */
|
||||
int maxproclen; /* Maximal length of argv[0] with \0 */
|
||||
@@ -184,6 +186,8 @@ struct {
|
||||
@@ -176,6 +178,8 @@ struct {
|
||||
{ "-WU", D_WROTE_UTMP_REBOOT},
|
||||
{ "-ST", D_SLTIME },
|
||||
{ "-DB", D_DIDBOOT },
|
||||
@ -18,7 +20,7 @@
|
||||
{ "", 0 }
|
||||
};
|
||||
struct {
|
||||
@@ -379,6 +383,12 @@ static CHILD *get_record(FILE *f)
|
||||
@@ -371,6 +375,12 @@ static CHILD *get_record(FILE *f)
|
||||
case D_DIDBOOT:
|
||||
fscanf(f, "%d\n", &did_boot);
|
||||
break;
|
||||
@ -31,7 +33,7 @@
|
||||
default:
|
||||
if (cmd > 0 || cmd == C_EOF) {
|
||||
oops_error = -1;
|
||||
@@ -1705,6 +1715,8 @@ int read_level(int arg)
|
||||
@@ -1697,6 +1707,8 @@ int read_level(int arg)
|
||||
}
|
||||
|
||||
/* Store both the old and the new runlevel. */
|
||||
@ -40,7 +42,7 @@
|
||||
write_utmp_wtmp("runlevel", "~~", foo + 256*runlevel, RUN_LVL, "~");
|
||||
thislevel = foo;
|
||||
prevlevel = runlevel;
|
||||
@@ -1905,6 +1917,25 @@ void re_exec(void)
|
||||
@@ -1897,6 +1909,25 @@ void re_exec(void)
|
||||
initlog(L_CO, "Attempt to re-exec failed");
|
||||
}
|
||||
|
||||
@ -66,7 +68,7 @@
|
||||
|
||||
/*
|
||||
* We got a change runlevel request through the
|
||||
@@ -1936,6 +1967,7 @@ void fifo_new_level(int level)
|
||||
@@ -1928,6 +1959,7 @@ void fifo_new_level(int level)
|
||||
if (oldlevel != 'S' && runlevel == 'S') console_stty();
|
||||
if (runlevel == '6' || runlevel == '0' ||
|
||||
runlevel == '1') console_stty();
|
||||
@ -74,7 +76,7 @@
|
||||
read_inittab();
|
||||
fail_cancel();
|
||||
setproctitle("init [%c]", runlevel);
|
||||
@@ -2231,6 +2263,8 @@ void boot_transitions()
|
||||
@@ -2223,6 +2255,8 @@ void boot_transitions()
|
||||
}
|
||||
if (loglevel > 0) {
|
||||
initlog(L_VB, "Entering runlevel: %c", runlevel);
|
||||
@ -83,7 +85,7 @@
|
||||
write_utmp_wtmp("runlevel", "~~", runlevel + 256 * oldlevel, RUN_LVL, "~");
|
||||
thislevel = runlevel;
|
||||
prevlevel = oldlevel;
|
||||
@@ -2409,6 +2443,7 @@ int init_main()
|
||||
@@ -2401,6 +2435,7 @@ int init_main()
|
||||
console_init();
|
||||
|
||||
if (!reload) {
|
||||
@ -91,7 +93,7 @@
|
||||
|
||||
/* Close whatever files are open, and reset the console. */
|
||||
close(0);
|
||||
@@ -2426,7 +2461,8 @@ int init_main()
|
||||
@@ -2418,7 +2453,8 @@ int init_main()
|
||||
* Initialize /var/run/utmp (only works if /var is on
|
||||
* root and mounted rw)
|
||||
*/
|
||||
@ -101,8 +103,10 @@
|
||||
|
||||
/*
|
||||
* Say hello to the world
|
||||
--- src/init.h
|
||||
+++ src/init.h 2006-08-22 14:29:39.000000000 +0200
|
||||
Index: src/init.h
|
||||
===================================================================
|
||||
--- src/init.h.orig
|
||||
+++ src/init.h
|
||||
@@ -99,6 +99,10 @@ typedef struct _child_ {
|
||||
extern CHILD *family;
|
||||
extern int wrote_wtmp_reboot;
|
||||
@ -121,8 +125,10 @@
|
||||
+#define D_WROTE_WTMP_RLEVEL -16
|
||||
+#define D_WROTE_UTMP_RLEVEL -17
|
||||
|
||||
--- src/utmp.c
|
||||
+++ src/utmp.c 2006-08-22 14:28:52.000000000 +0200
|
||||
Index: src/utmp.c
|
||||
===================================================================
|
||||
--- src/utmp.c.orig
|
||||
+++ src/utmp.c
|
||||
@@ -49,6 +49,12 @@ char *line) /* Which line is this */
|
||||
struct utsname uname_buf;
|
||||
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Nov 15 14:01:30 CET 2009 - meissner@suse.de
|
||||
|
||||
- refresh all patches with fuzz=0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 2 17:10:48 CET 2009 - mmarek@suse.cz
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user