shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Code

unit: never apply /etc/rcN.d/ priority to native services

Browse Source
This commit is contained in:
Lennart Poettering 2011-03-30 00:43:16 +02:00
parent efbac6d29c
commit ea87ca5a9e
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -2,8 +2,6 @@ F15:
* swap units that are activated by one name but shown in the kernel under another are semi-broken * swap units that are activated by one name but shown in the kernel under another are semi-broken
* dep cycle basic → udev-retry → auditd → iptables → basic
* isolate multi-user.target doesn't start a getty@tty1 if we run it from graphical.target * isolate multi-user.target doesn't start a getty@tty1 if we run it from graphical.target
* NFS, networkmanager ordering issue (PENDING) * NFS, networkmanager ordering issue (PENDING)

13
src/service.c
View File

@ -115,6 +115,7 @@ static void service_init(Unit *u) {
s->timer_watch.type = WATCH_INVALID; s->timer_watch.type = WATCH_INVALID;
#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;
#endif #endif
s->socket_fd = -1; s->socket_fd = -1;
s->guess_main_pid = true; s->guess_main_pid = true;
@ -537,7 +538,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
* data from the LSB header. */ * data from the LSB header. */
if (start_priority < 0 || start_priority > 99) if (start_priority < 0 || start_priority > 99)
log_warning("[%s:%u] Start priority out of range. Ignoring.", path, line); log_warning("[%s:%u] Start priority out of range. Ignoring.", path, line);
else if (s->sysv_start_priority < 0) else
s->sysv_start_priority = start_priority; s->sysv_start_priority = start_priority;
char_array_0(runlevels); char_array_0(runlevels);
@ -853,6 +854,12 @@ static int service_load_sysv_path(Service *s, const char *path) {
u->meta.description = d; u->meta.description = d;
} }
/* The priority that has been set in /etc/rcN.d/ hierarchies
* takes precedence over what is stored as default in the LSB
* header */
if (s->sysv_start_priority_from_rcnd >= 0)
s->sysv_start_priority = s->sysv_start_priority_from_rcnd;
u->meta.load_state = UNIT_LOADED; u->meta.load_state = UNIT_LOADED;
r = 0; r = 0;
@ -3009,8 +3016,8 @@ static int service_enumerate(Manager *m) {
if (de->d_name[0] == 'S') { if (de->d_name[0] == 'S') {
if (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_SYSINIT) { if (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_SYSINIT) {
SERVICE(service)->sysv_start_priority = SERVICE(service)->sysv_start_priority_from_rcnd =
MAX(a*10 + b, SERVICE(service)->sysv_start_priority); MAX(a*10 + b, SERVICE(service)->sysv_start_priority_from_rcnd);
SERVICE(service)->sysv_enabled = true; SERVICE(service)->sysv_enabled = true;
} }

1
src/service.h
View File

@ -138,6 +138,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;
int sysv_start_priority_from_rcnd;
int sysv_start_priority; int sysv_start_priority;
char *sysv_path; char *sysv_path;