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=63
This commit is contained in:
Dr. Werner Fink 2010-07-27 08:57:45 +00:00 committed by Git OBS Bridge
parent b4c5ee1218
commit 8417702aa6
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
killproc-2.16.dif
View File

@ -195,7 +195,7 @@
if (check_pids(fullname,root,flags) < 0) if (check_pids(fullname,root,flags) < 0)
--- libinit.c --- libinit.c
+++ libinit.c 2009-10-28 09:47:13.711429753 +0000 +++ libinit.c 2010-07-27 08:56:18.146924383 +0000
@@ -320,13 +320,15 @@ static ssize_t xread(int fd, void *inbuf @@ -320,13 +320,15 @@ static ssize_t xread(int fd, void *inbuf
while (1) { while (1) {
errno = 0; errno = 0;
@ -241,6 +241,15 @@
continue; continue;
thread = (strncmp(ent, "0 ", 2) == 0); thread = (strncmp(ent, "0 ", 2) == 0);
@@ -673,7 +676,7 @@ int pidof (const char * inname, const ch
* do not hold a file descriptor opened on the script file.
*/
if (!(flags & (KTHREAD|KSHORT)) && isscrpt &&
- (fp = openat(dfd, here(d->d_name, "cmd"), O_PROCMODE)) != -1) {
+ (fp = openat(dfd, here(d->d_name, "cmdline"), O_PROCMODE)) != -1) {
char entry[PATH_MAX+1];
const char *scrpt = NULL;
@@ -682,6 +685,9 @@ int pidof (const char * inname, const ch @@ -682,6 +685,9 @@ int pidof (const char * inname, const ch
len = xread(fp, entry, PATH_MAX); len = xread(fp, entry, PATH_MAX);
close(fp); close(fp);
@ -298,6 +307,15 @@
goto out; goto out;
thread = (strncmp(ent, "0 ", 2) == 0); thread = (strncmp(ent, "0 ", 2) == 0);
@@ -923,7 +932,7 @@ int verify_pidfile (const char * pid_fil
}
if (!(flags & (KTHREAD|KSHORT))&& isscrpt &&
- (fp = open(proc(buf, "cmd"), O_PROCMODE)) != -1) {
+ (fp = open(proc(buf, "cmdline"), O_PROCMODE)) != -1) {
char entry[PATH_MAX+1];
const char *scrpt = NULL;
@@ -932,6 +941,9 @@ int verify_pidfile (const char * pid_fil @@ -932,6 +941,9 @@ int verify_pidfile (const char * pid_fil
len = xread(fp, entry, PATH_MAX); len = xread(fp, entry, PATH_MAX);
close(fp); close(fp);
@ -326,6 +344,15 @@
goto ignore; /* Bogus */ goto ignore; /* Bogus */
thread = (strncmp(ent, "0 ", 2) == 0); thread = (strncmp(ent, "0 ", 2) == 0);
@@ -1102,7 +1114,7 @@ int check_pids (const char * inname, con
}
if (!(flags & (KTHREAD|KSHORT)) && isscrpt &&
- (fp = open(proc(pid, "cmd"), O_PROCMODE)) != -1) {
+ (fp = open(proc(pid, "cmdline"), O_PROCMODE)) != -1) {
char entry[PATH_MAX+1];
const char *scrpt;
@@ -1111,7 +1123,7 @@ int check_pids (const char * inname, con @@ -1111,7 +1123,7 @@ int check_pids (const char * inname, con
len = xread(fp, entry, PATH_MAX); len = xread(fp, entry, PATH_MAX);
close(fp); close(fp);

5
sysvinit.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 27 10:56:47 CEST 2010 - werner@suse.de
- Fix typo that is use "cmdline" instead of "cmd" (bnc#623766)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 20 11:43:58 CEST 2010 - werner@suse.de Tue Jul 20 11:43:58 CEST 2010 - werner@suse.de