checked in (request 30828)

OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=25

sysvinit-2.86-fuse-no-kill.patch

@@ -1,5 +1,5 @@
 --- src/killall5.c
-+++ src/killall5.c	2009-01-27 15:32:40.000000000 +0000
++++ src/killall5.c	2009-01-27 16:32:40.000000000 +0100
 @@ -59,6 +59,8 @@ typedef struct proc {
  	pid_t pid;		/* Process ID.			  */
  	int sid;		/* Session ID.			  */

sysvinit-2.86-mdmon-no-kill.patch

@@ -2,7 +2,9 @@
  src/killall5.c |   10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
---- src/killall5.c
+Index: src/killall5.c
+===================================================================
+--- src/killall5.c.orig
 +++ src/killall5.c
 @@ -62,6 +62,7 @@ typedef struct proc {
  	char isfuse;		/* Provides FUSE filesystems	  */
@@ -17,7 +19,7 @@
  		p->isudev = (strncmp(buf, "/sbin/udevd", 11) == 0);
  
 +		/* Check for mdmon */
-+		p->ismdmon = (strncmp(buf, "/sbin/mdmon", 11) == 0);
++		p->ismdmon = (strcmp(buf, "/sbin/mdmon") == 0);
 +
  		/* Check for provider of FUSE filesystems */
  		p->isfuse = is_fuse(d->d_name);

sysvinit.changes

@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Fri Jan 29 14:30:44 CET 2010 - werner@suse.de
-
-- Remove start-stop-daemon binary (bnc#568950)
-
 -------------------------------------------------------------------
 Mon Dec 21 16:16:13 CET 2009 - werner@suse.de
 

sysvinit.spec

@@ -123,6 +123,9 @@ popd
   CFLAGS="-Wall ${RPM_OPT_FLAGS} -D_GNU_SOURCE -D__NO_STRING_INLINES -pipe"
   CC=gcc
   make %{?jobs:-j%jobs} -C src CFLAGS="$CFLAGS" CC="$CC"
+  pushd contrib/
+    $CC $CFLAGS -o start-stop-daemon start-stop-daemon.c
+  popd
 pushd ../showconsole-%{SCVER}
   make %{?jobs:-j%jobs};
 popd
@@ -154,6 +157,7 @@ popd
   mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man5
   mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
   make install -C src MANPATH=%{_mandir} ROOT=${RPM_BUILD_ROOT}
+  install contrib/start-stop-daemon ${RPM_BUILD_ROOT}/sbin/
   test -p     ${RPM_BUILD_ROOT}/dev/initctl || {
     rm -f     ${RPM_BUILD_ROOT}/dev/initctl
     mknod     ${RPM_BUILD_ROOT}/dev/initctl p
@@ -237,6 +241,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc   ../powerd-%{PDVER}/powerd.conf.monitor
 %doc   ../powerd-%{PDVER}/powerd.conf.peer
 %endif
+%doc   contrib/start-stop-daemon.README
 # %doc contrib/bootlogd.README
 %dir /lib/mkinitrd
 %dir /lib/mkinitrd/scripts
@@ -271,6 +276,7 @@ rm -rf ${RPM_BUILD_ROOT}
 /sbin/startproc
 /sbin/start_daemon
 /sbin/shutdown
+/sbin/start-stop-daemon
 /sbin/sulogin
 /sbin/telinit
 /sbin/startpar