pool/sysvinit
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=76
This commit is contained in:
Dr. Werner Fink 2010-10-12 16:46:15 +00:00 committed by Git OBS Bridge
parent 02767a4908
commit 662d7af7aa
1 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
startpar-0.57.dif
View File

@ -1,5 +1,15 @@
--- makeboot.c
+++ makeboot.c 2010-10-12 16:42:53.996426160 +0000
@@ -407,6 +407,7 @@ void check_run_files(const char *action,
*/
#ifndef USE_BLOGD
# define bootlog(arg...)
+# define closeblog()
#endif
/*
--- proc.c --- proc.c
+++ proc.c 2010-09-30 14:19:15.595926333 +0200 +++ proc.c 2010-09-30 12:19:16.000000000 +0000
@@ -94,3 +94,74 @@ int read_proc(unsigned long int * const @@ -94,3 +94,74 @@ int read_proc(unsigned long int * const
return 0; return 0;
} }
@ -76,7 +86,7 @@
+ } + }
+} +}
--- proc.h --- proc.h
+++ proc.h 2010-09-30 14:41:35.271926120 +0200 +++ proc.h 2010-09-30 12:41:35.000000000 +0000
@@ -19,5 +19,3 @@ @@ -19,5 +19,3 @@
extern int read_proc(unsigned long int *prcs_run, unsigned long int *prcs_blked); extern int read_proc(unsigned long int *prcs_run, unsigned long int *prcs_blked);
@ -84,8 +94,29 @@
-extern void unraw_consoles(void); -extern void unraw_consoles(void);
-extern void raw_consoles(void); -extern void raw_consoles(void);
--- startpar.c --- startpar.c
+++ startpar.c 2010-09-30 15:01:50.787926081 +0200 +++ startpar.c 2010-10-12 16:45:32.040429641 +0000
@@ -241,14 +241,7 @@ void callsplash(int n, const char *path, @@ -52,6 +52,12 @@
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
+#ifdef USE_BLOGD
+# include <libblogger.h>
+#else
+# define bootlog(arg...)
+# define closeblog()
+#endif
#include "makeboot.h"
#include "proc.h"
@@ -197,6 +203,7 @@ void closeall(void)
for (s = 0; s < par; s++)
if (prgs[s].fd)
close(prgs[s].fd);
+ closeblog();
}
void callsplash(int n, const char *path, char *action)
@@ -241,14 +248,7 @@ void callsplash(int n, const char *path,
return; return;
} }
@ -101,7 +132,7 @@
sigprocmask(SIG_UNBLOCK, &nmask, NULL); sigprocmask(SIG_UNBLOCK, &nmask, NULL);
(void)signal(SIGINT, SIG_DFL); (void)signal(SIGINT, SIG_DFL);
@@ -258,6 +251,7 @@ void callsplash(int n, const char *path, @@ -258,6 +258,7 @@ void callsplash(int n, const char *path,
(void)signal(SIGTERM, SIG_DFL); (void)signal(SIGTERM, SIG_DFL);
(void)signal(SIGCHLD, SIG_DFL); (void)signal(SIGCHLD, SIG_DFL);
(void)signal(SIGTTIN, SIG_DFL); (void)signal(SIGTTIN, SIG_DFL);
@ -109,7 +140,7 @@
TEMP_FAILURE_RETRY(dup2(2, 1)); TEMP_FAILURE_RETRY(dup2(2, 1));
closeall(); closeall();
@@ -456,14 +450,7 @@ void run(struct prg *p) @@ -456,14 +457,7 @@ void run(struct prg *p)
return; return;
} }
@ -125,7 +156,7 @@
sigprocmask(SIG_UNBLOCK, &nmask, NULL); sigprocmask(SIG_UNBLOCK, &nmask, NULL);
(void)signal(SIGINT, SIG_DFL); (void)signal(SIGINT, SIG_DFL);
@@ -473,6 +460,7 @@ void run(struct prg *p) @@ -473,6 +467,7 @@ void run(struct prg *p)
(void)signal(SIGTERM, SIG_DFL); (void)signal(SIGTERM, SIG_DFL);
(void)signal(SIGCHLD, SIG_DFL); (void)signal(SIGCHLD, SIG_DFL);
(void)signal(SIGTTIN, SIG_DFL); (void)signal(SIGTTIN, SIG_DFL);
@ -133,7 +164,7 @@
if (setpgid(0, 0)) if (setpgid(0, 0))
perror("setpgid"); perror("setpgid");
@@ -582,14 +570,7 @@ int run_single(const char *prg, const ch @@ -582,14 +577,7 @@ int run_single(const char *prg, const ch
{ {
sigset_t nmask; sigset_t nmask;
@ -149,7 +180,7 @@
sigprocmask(SIG_UNBLOCK, &nmask, NULL); sigprocmask(SIG_UNBLOCK, &nmask, NULL);
(void)signal(SIGINT, SIG_DFL); (void)signal(SIGINT, SIG_DFL);
@@ -599,6 +580,7 @@ int run_single(const char *prg, const ch @@ -599,6 +587,7 @@ int run_single(const char *prg, const ch
(void)signal(SIGTERM, SIG_DFL); (void)signal(SIGTERM, SIG_DFL);
(void)signal(SIGCHLD, SIG_DFL); (void)signal(SIGCHLD, SIG_DFL);
(void)signal(SIGTTIN, SIG_DFL); (void)signal(SIGTTIN, SIG_DFL);
@ -157,7 +188,7 @@
TEMP_FAILURE_RETRY(dup2(2, 1)); TEMP_FAILURE_RETRY(dup2(2, 1));
closeall(); closeall();
@@ -632,19 +614,20 @@ void do_forward(void) @@ -632,19 +621,20 @@ void do_forward(void)
{ {
if (errno == EINTR) if (errno == EINTR)
continue; continue;
@ -180,7 +211,7 @@
rr = r; rr = r;
} }
r -= rr; r -= rr;
@@ -730,9 +713,23 @@ void detach(struct prg *p, const int sto @@ -730,9 +720,23 @@ void detach(struct prg *p, const int sto
{ {
if ((pid = fork()) == 0) if ((pid = fork()) == 0)
{ {
@ -204,7 +235,7 @@
execlp(myname, myname, "-f", "--", p->name, NULL); execlp(myname, myname, "-f", "--", p->name, NULL);
do_forward(); do_forward();
} }
@@ -833,6 +830,8 @@ int main(int argc, char **argv) @@ -833,6 +837,8 @@ int main(int argc, char **argv)
char *splashopt = 0; char *splashopt = 0;
sigset_t nmask, omask, smask; sigset_t nmask, omask, smask;