rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 122369 from Base:System

Browse Source 
- Re-enable logind-logout.patch, fix in xdm-np PAM file is the real
  fix.

- Update new-lsb-headers.patch to handle entries written after
  description tag (bnc#727771, bnc#747931).

OBS-URL: https://build.opensuse.org/request/show/122369
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=99
This commit is contained in:
Stephan Kulow 2012-05-26 11:00:31 +00:00 committed by Git OBS Bridge
commit b3969e3d4a
3 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
new-lsb-headers.patch
View File

@ -1,8 +1,8 @@
Index: systemd-41/src/service.c Index: systemd-44/src/service.c
=================================================================== ===================================================================
--- systemd-41.orig/src/service.c --- systemd-44.orig/src/service.c
+++ systemd-41/src/service.c +++ systemd-44/src/service.c
@@ -119,6 +119,7 @@ static void service_init(Unit *u) { @@ -122,6 +122,7 @@ static void service_init(Unit *u) {
#ifdef HAVE_SYSV_COMPAT #ifdef HAVE_SYSV_COMPAT
s->sysv_start_priority = -1; s->sysv_start_priority = -1;
s->sysv_start_priority_from_rcnd = -1; s->sysv_start_priority_from_rcnd = -1;
@ -10,10 +10,10 @@ Index: systemd-41/src/service.c
#endif #endif
s->socket_fd = -1; s->socket_fd = -1;
s->guess_main_pid = true; s->guess_main_pid = true;
@@ -861,6 +862,34 @@ static int service_load_sysv_path(Servic @@ -840,6 +841,34 @@ static int service_load_sysv_path(Servic
free(short_description);
short_description = d;
} else
state = LSB;
+ } else if (startswith_no_case(t, "PIDFile:")) { + } else if (startswith_no_case(t, "PIDFile:")) {
+ char *fn; + char *fn;
+ +
@ -42,10 +42,10 @@ Index: systemd-41/src/service.c
+ s->remain_after_exit = parse_boolean(j); + s->remain_after_exit = parse_boolean(j);
+ s->sysv_remain_after_exit_heuristic = false; + s->sysv_remain_after_exit_heuristic = false;
+ } + }
} } else if (state == LSB_DESCRIPTION) {
}
} if (startswith(l, "#\t") || startswith(l, "# ")) {
@@ -891,7 +920,8 @@ static int service_load_sysv_path(Servic @@ -894,7 +923,8 @@ static int service_load_sysv_path(Servic
/* Special setting for all SysV services */ /* Special setting for all SysV services */
s->type = SERVICE_FORKING; s->type = SERVICE_FORKING;
@ -55,7 +55,7 @@ Index: systemd-41/src/service.c
s->guess_main_pid = false; s->guess_main_pid = false;
s->restart = SERVICE_RESTART_NO; s->restart = SERVICE_RESTART_NO;
s->exec_context.ignore_sigpipe = false; s->exec_context.ignore_sigpipe = false;
@@ -2030,7 +2060,7 @@ static void service_enter_running(Servic @@ -2036,7 +2066,7 @@ static void service_enter_running(Servic
if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) && if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) &&
(s->bus_name_good || s->type != SERVICE_DBUS)) { (s->bus_name_good || s->type != SERVICE_DBUS)) {
#ifdef HAVE_SYSV_COMPAT #ifdef HAVE_SYSV_COMPAT
@ -64,11 +64,11 @@ Index: systemd-41/src/service.c
s->remain_after_exit = false; s->remain_after_exit = false;
#endif #endif
service_set_state(s, SERVICE_RUNNING); service_set_state(s, SERVICE_RUNNING);
Index: systemd-41/src/service.h Index: systemd-44/src/service.h
=================================================================== ===================================================================
--- systemd-41.orig/src/service.h --- systemd-44.orig/src/service.h
+++ systemd-41/src/service.h +++ systemd-44/src/service.h
@@ -157,6 +157,7 @@ struct Service { @@ -166,6 +166,7 @@ struct Service {
#ifdef HAVE_SYSV_COMPAT #ifdef HAVE_SYSV_COMPAT
bool sysv_has_lsb:1; bool sysv_has_lsb:1;
bool sysv_enabled:1; bool sysv_enabled:1;

12
systemd.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri May 25 11:08:27 UTC 2012 - fcrozat@suse.com
- Re-enable logind-logout.patch, fix in xdm-np PAM file is the real
fix.
-------------------------------------------------------------------
Thu May 24 11:45:54 UTC 2012 - fcrozat@suse.com
- Update new-lsb-headers.patch to handle entries written after
description tag (bnc#727771, bnc#747931).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 3 11:40:20 UTC 2012 - fcrozat@suse.com Thu May 3 11:40:20 UTC 2012 - fcrozat@suse.com

3
systemd.spec
View File

@ -155,8 +155,7 @@ Plymouth integration for systemd
%patch40 -p1 %patch40 -p1
%patch41 -p1 %patch41 -p1
%patch42 -p1 %patch42 -p1
# disabled for now, cause sudo session to terminate %patch43 -p1
#patch43 -p1
%patch44 -p1 %patch44 -p1
%build %build