checked in (request 37901)

OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=39
This commit is contained in:
OBS User autobuild 2010-04-14 13:37:57 +00:00 committed by Git OBS Bridge
parent 1e58522780
commit c9d43c5b94
5 changed files with 10 additions and 86 deletions

View File

@ -56,47 +56,9 @@
if (pidof(fullname,root,flags) < 0) if (pidof(fullname,root,flags) < 0)
exit(LSB_STATUS_PROOFX); exit(LSB_STATUS_PROOFX);
} }
--- killproc.8
+++ killproc.8 2010-04-12 15:49:09.610924538 +0000
@@ -57,9 +57,11 @@ is sent. If this program is not called w
.B killproc
then
.B SIGHUP
-is used. Note that if
+is used. Note that if no signal is specified and the program
+.B killproc
+does not terminate a process with the default
.B SIGTERM
-is used and does not terminate a process the signal
+the signal
.B SIGKILL
is send after a few seconds (default is 5 seconds, see option
.BR \-t ).
--- killproc.c --- killproc.c
+++ killproc.c 2010-04-12 15:43:46.802925071 +0000 +++ killproc.c 2009-12-07 15:36:39.299430484 +0000
@@ -48,6 +48,7 @@ int main(int argc, char **argv) @@ -135,7 +135,6 @@ int main(int argc, char **argv)
int process_group = 0, group_leader = 0, wait = 5, iargc = 0;
unsigned short flags = (KILL|PIDOF|KSTOP);
boolean pid_forced = false;
+ boolean sig_forced = true;
we_are = base_name(argv[0]);
openlog (we_are, LOG_OPTIONS, LOG_FACILITY);
@@ -79,11 +80,13 @@ int main(int argc, char **argv)
memset(sig, 0, len);
*sig = 'q'; /* set dummy option -q */
snum = tmp;
+ sig_forced = false;
break;
} else if ( (tmp = signame_to_signum(sig)) > 0 ) {
memset(sig, 0, len);
*sig = 'q'; /* set dummy option -q */
snum = tmp;
+ sig_forced = false;
break;
}
}
@@ -135,7 +138,6 @@ int main(int argc, char **argv)
/* Allocate here: address optarg (current *argv) isn't freeable */ /* Allocate here: address optarg (current *argv) isn't freeable */
if (optarg && !pid_file) { if (optarg && !pid_file) {
pid_file = xstrdup(optarg); pid_file = xstrdup(optarg);
@ -104,7 +66,7 @@
} else } else
error(LSB_WRGSYN,"Option -p requires pid file to read pid from\n"); error(LSB_WRGSYN,"Option -p requires pid file to read pid from\n");
break; break;
@@ -195,7 +197,8 @@ int main(int argc, char **argv) @@ -195,7 +194,8 @@ int main(int argc, char **argv)
pid_file = (char*) xmalloc(DEFPIDLEN+strlen(basename)+1); pid_file = (char*) xmalloc(DEFPIDLEN+strlen(basename)+1);
pid_file = strcat(strcat(strcpy(pid_file,DEFPIDDIR),basename),DEFPIDEXT); pid_file = strcat(strcat(strcpy(pid_file,DEFPIDDIR),basename),DEFPIDEXT);
} }
@ -114,7 +76,7 @@
/* Check and verify the pid file */ /* Check and verify the pid file */
errno = 0; errno = 0;
@@ -215,17 +218,22 @@ int main(int argc, char **argv) @@ -215,17 +215,22 @@ int main(int argc, char **argv)
if (!remember) if (!remember)
exit(LSB_NOPROC); /* New LSB: no pid file is no job */ exit(LSB_NOPROC); /* New LSB: no pid file is no job */
} }
@ -139,15 +101,6 @@
} }
if (pid_file) { /* The case of having a pid file */ if (pid_file) { /* The case of having a pid file */
@@ -269,7 +277,7 @@ int main(int argc, char **argv)
for(list = remember; list; list = list->next)
do_kill(basename, list->pid, snum, group_leader, process_group);
- if (snum == SIGTERM || snum == SIGKILL) {
+ if ((sig_forced && snum == SIGTERM) || snum == SIGKILL) {
int partsec = 5*wait; /* We look 5 times within a second */
/*
* Does anybody have a better idea ... something with sigaction()/signal()
--- libinit.c --- libinit.c
+++ libinit.c 2009-10-28 09:47:13.711429753 +0000 +++ libinit.c 2009-10-28 09:47:13.711429753 +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

View File

@ -1,12 +1,4 @@
--- makeboot.c --- .dummy
+++ makeboot.c 2010-04-09 12:25:53.046395753 +0000 +++ .dummy 2009-08-19 12:18:39.181901099 +0200
@@ -248,6 +248,9 @@ void parse_makefile(const char *path) @@ -0,0 +1 @@
if (! strcmp(node->name, "xdm")) +this is a dummy, remove if real changes are required
importance = 100;
+ if (! strcmp(node->name, "sshd"))
+ importance = 2000;
+
if (! strncmp(node->name, "early", 5))
importance = 8000;

View File

@ -1,6 +1,6 @@
--- .pkgextract --- .pkgextract
+++ .pkgextract 2006-08-18 14:45:28.000000000 +0200 +++ .pkgextract 2006-08-18 14:45:28.000000000 +0200
@@ -0,0 +1,15 @@ @@ -0,0 +1,14 @@
+patch -p0 -b -s --suffix=.nfs4pidof < ../sysvinit-2.86-nfs4pidof.patch +patch -p0 -b -s --suffix=.nfs4pidof < ../sysvinit-2.86-nfs4pidof.patch
+patch -p0 -b -s --suffix=.sulogin < ../sysvinit-2.86-sulogin.patch +patch -p0 -b -s --suffix=.sulogin < ../sysvinit-2.86-sulogin.patch
+patch -p0 -b -s --suffix=.ststdmn < ../sysvinit-2.82-startstop.patch +patch -p0 -b -s --suffix=.ststdmn < ../sysvinit-2.82-startstop.patch
@ -15,7 +15,6 @@
+patch -p0 -b -s --suffix=.hddown < ../sysvinit-2.86-hddown.patch +patch -p0 -b -s --suffix=.hddown < ../sysvinit-2.86-hddown.patch
+patch -p0 -b -s --suffix=.selinux < ../sysvinit-2.86-selinux.patch +patch -p0 -b -s --suffix=.selinux < ../sysvinit-2.86-selinux.patch
+patch -p0 -b -s --suffix=.fuse < ../sysvinit-2.86-fuse-no-kill.patch +patch -p0 -b -s --suffix=.fuse < ../sysvinit-2.86-fuse-no-kill.patch
+patch -p0 -b -s --suffix=.mdmon < ../sysvinit-2.86-mdmon-no-kill.patch
--- src/Makefile --- src/Makefile
+++ src/Makefile 2009-05-11 10:05:28.482401539 +0200 +++ src/Makefile 2009-05-11 10:05:28.482401539 +0200
@@ -8,17 +8,20 @@ @@ -8,17 +8,20 @@

View File

@ -1,18 +1,3 @@
-------------------------------------------------------------------
Mon Apr 12 17:49:46 CEST 2010 - werner@suse.de
- Be LSB compliant with killproc (bnc#595796, bnc#578246)
-------------------------------------------------------------------
Fri Apr 9 15:45:51 CEST 2010 - werner@suse.de
- Correct Pre-Requires to reflect package split
-------------------------------------------------------------------
Fri Apr 9 14:30:08 CEST 2010 - werner@suse.de
- Start the service sshd as early as possible (bnc#594223)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 3 13:22:11 UTC 2010 - coolo@novell.com Wed Mar 3 13:22:11 UTC 2010 - coolo@novell.com

View File

@ -27,6 +27,7 @@ Name: sysvinit
%define START 0.54 %define START 0.54
License: GPLv2+ License: GPLv2+
Group: System/Base Group: System/Base
PreReq: coreutils
AutoReqProv: on AutoReqProv: on
Version: 2.86 Version: 2.86
Release: 222 Release: 222
@ -80,12 +81,6 @@ more information.
License: GPLv2+ License: GPLv2+
Summary: Tools for basic booting Summary: Tools for basic booting
Group: System/Base Group: System/Base
%if 0%{suse_version} > 1120
Requires(preun): coreutils mkinitrd %insserv_prereq
Requires(postun): coreutils mkinitrd %insserv_prereq
%else
PreReq: coreutils mkinitrd %insserv_prereq
%endif
%description tools %description tools
Helper tools from sysvinit that support booting, including but not exclusive Helper tools from sysvinit that support booting, including but not exclusive