From 8417702aa650f17a8d185f3fb905a70af3b4d57769818789143914c3c20641e9 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 27 Jul 2010 08:57:45 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=63
---
 killproc-2.16.dif | 29 ++++++++++++++++++++++++++++-
 sysvinit.changes  |  5 +++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/killproc-2.16.dif b/killproc-2.16.dif
index c50e6c5..ac364b5 100644
--- a/killproc-2.16.dif
+++ b/killproc-2.16.dif
@@ -195,7 +195,7 @@
  
  	if (check_pids(fullname,root,flags) < 0)
 --- 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
      while (1) {
  	errno = 0;
@@ -241,6 +241,15 @@
  		continue;
      
  	    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
  	    len = xread(fp, entry, PATH_MAX);
  	    close(fp);
@@ -298,6 +307,15 @@
  	    goto out;
      
  	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
  	len = xread(fp, entry, PATH_MAX);
  	close(fp);
@@ -326,6 +344,15 @@
  		goto ignore;		/* Bogus */
  
  	    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
  	    len = xread(fp, entry, PATH_MAX);
  	    close(fp);
diff --git a/sysvinit.changes b/sysvinit.changes
index 9a07bef..a7abb91 100644
--- a/sysvinit.changes
+++ b/sysvinit.changes
@@ -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