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

Accepting request 23608 from home:michal-m:branches:Base:System

Browse Source 
Copy from home:michal-m:branches:Base:System/sysvinit via accept of submit request 23608 revision 3.
Request was accepted with message:
reviewed ok.

OBS-URL: https://build.opensuse.org/request/show/23608
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=13
This commit is contained in:
Dr. Werner Fink 2009-11-02 16:28:31 +00:00 committed by Git OBS Bridge
parent ae4540e0a4
commit 782e8a1416
4 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
killproc-2.16.dif
View File

@ -12,7 +12,7 @@
- continue;
- if (bytes < 0)
+ if (bytes < 0) {
+ if (errno == EINTR || errno == EAGAIN))
+ if (errno == EINTR || errno == EAGAIN)
+ continue;
+ if (errno == ESRCH)
+ goto out;

40
sysvinit-2.86-mdmon-no-kill.patch Normal file
View File

@ -0,0 +1,40 @@
---
src/killall5.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- src/killall5.c.orig
+++ src/killall5.c
@@ -62,6 +62,7 @@ typedef struct proc {
char isfuse; /* Provides FUSE filesystems */
char isudev; /* Is the uevent handler */
char nfs; /* Binary is loacted on NFS part. */
+ char ismdmon; /* Is an instance of /sbin/mdmon. */
struct proc *next; /* Pointer to next struct. */
} PROC;
@@ -482,6 +483,9 @@ int readproc()
/* Check for uevent handler */
p->isudev = (strncmp(buf, "/sbin/udevd", 11) == 0);
+ /* Check for mdmon */
+ p->ismdmon = (strcmp(buf, "/sbin/mdmon") == 0);
+
/* 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);
}
- /* Now kill all processes except init (pid 1), our session, and FUSE filesystems. */
+ /* Now kill all processes except init (pid 1), our session,
+ * FUSE filesystems and /sbin/mdmon */
sid = (int)getsid(0);
pid = (int)getpid();
for (p = plist; p; p = p->next) {
- if (p->pid == 1 || p->pid == pid || p->sid == sid || p->kernel || p->isfuse) {
+ if (p->pid == 1 || p->pid == pid || p->sid == sid || p->kernel
+ || p->isfuse || p->ismdmon) {
kill(p->pid, SIGCONT);
continue;
}

10
sysvinit.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Nov 2 17:10:48 CET 2009 - mmarek@suse.cz
- fixed killproc-2.16.dif.
-------------------------------------------------------------------
Thu Oct 29 22:39:27 CET 2009 - mmarek@suse.cz
- killall5: do not kill /sbin/mdmon (fate#306823).
-------------------------------------------------------------------
Wed Oct 28 10:47:42 CET 2009 - werner@suse.de

2
sysvinit.spec
View File

@ -63,6 +63,7 @@ Patch16: sysvinit-2.86-full-time.patch
Patch17: sysvinit-2.86-hddown.patch
Patch18: sysvinit-2.86-selinux.patch
Patch19: sysvinit-2.86-fuse-no-kill.patch
Patch20: sysvinit-2.86-mdmon-no-kill.patch
%description
System V style init programs by Miquel van Smoorenburg that control the
@ -98,6 +99,7 @@ Authors:
%patch -P 17 -b .hddown
%patch -P 18 -b .selinux
%patch -P 19 -b .fuse
%patch -P 20 -b .mdmon
%patch
pushd ../powerd-%{PDVER}
%patch -P 2