chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: recheck unit paths on daemon reload
[elogind.git]
/
src
/
service.c
diff --git
a/src/service.c
b/src/service.c
index 8b1fab785ac364e287befcbe14bfda708c501d08..e1975eb119112c4e7c7d8b9adc72201714969454 100644
(file)
--- a/
src/service.c
+++ b/
src/service.c
@@
-40,7
+40,7
@@
typedef enum RunlevelType {
RUNLEVEL_UP,
RUNLEVEL_DOWN,
typedef enum RunlevelType {
RUNLEVEL_UP,
RUNLEVEL_DOWN,
- RUNLEVEL_
BASIC
+ RUNLEVEL_
SYSINIT
} RunlevelType;
static const struct {
} RunlevelType;
static const struct {
@@
-58,10
+58,10
@@
static const struct {
{ "rc6.d", SPECIAL_RUNLEVEL6_TARGET, RUNLEVEL_DOWN },
/* SUSE style boot.d */
{ "rc6.d", SPECIAL_RUNLEVEL6_TARGET, RUNLEVEL_DOWN },
/* SUSE style boot.d */
- { "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_
BASIC
},
+ { "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_
SYSINIT
},
/* Debian style rcS.d */
/* Debian style rcS.d */
- { "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_
BASIC
},
+ { "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_
SYSINIT
},
};
#define RUNLEVELS_UP "12345"
};
#define RUNLEVELS_UP "12345"
@@
-1377,7
+1377,7
@@
static void service_enter_stop_post(Service *s, bool success) {
return;
fail:
return;
fail:
- log_warning("%s failed to run
stop-post executable
: %s", UNIT(s)->meta.id, strerror(-r));
+ log_warning("%s failed to run
'stop-post' task
: %s", UNIT(s)->meta.id, strerror(-r));
service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
}
service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
}
@@
-1473,7
+1473,7
@@
static void service_enter_stop(Service *s, bool success) {
return;
fail:
return;
fail:
- log_warning("%s failed to run
stop executable
: %s", UNIT(s)->meta.id, strerror(-r));
+ log_warning("%s failed to run
'stop' task
: %s", UNIT(s)->meta.id, strerror(-r));
service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
}
service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
}
@@
-1518,7
+1518,7
@@
static void service_enter_start_post(Service *s) {
return;
fail:
return;
fail:
- log_warning("%s failed to run
start-post executable
: %s", UNIT(s)->meta.id, strerror(-r));
+ log_warning("%s failed to run
'start-post' task
: %s", UNIT(s)->meta.id, strerror(-r));
service_enter_stop(s, false);
}
service_enter_stop(s, false);
}
@@
-1584,7
+1584,7
@@
static void service_enter_start(Service *s) {
return;
fail:
return;
fail:
- log_warning("%s failed to run
start exectuable
: %s", UNIT(s)->meta.id, strerror(-r));
+ log_warning("%s failed to run
'start' task
: %s", UNIT(s)->meta.id, strerror(-r));
service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
}
service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
}
@@
-1613,7
+1613,7
@@
static void service_enter_start_pre(Service *s) {
return;
fail:
return;
fail:
- log_warning("%s failed to run
start-pre executable
: %s", UNIT(s)->meta.id, strerror(-r));
+ log_warning("%s failed to run
'start-pre' task
: %s", UNIT(s)->meta.id, strerror(-r));
service_enter_dead(s, false, true);
}
service_enter_dead(s, false, true);
}
@@
-1660,7
+1660,7
@@
static void service_enter_reload(Service *s) {
return;
fail:
return;
fail:
- log_warning("%s failed to run
reload executable
: %s", UNIT(s)->meta.id, strerror(-r));
+ log_warning("%s failed to run
'reload' task
: %s", UNIT(s)->meta.id, strerror(-r));
service_enter_stop(s, false);
}
service_enter_stop(s, false);
}
@@
-1690,7
+1690,7
@@
static void service_run_next(Service *s, bool success) {
return;
fail:
return;
fail:
- log_warning("%s failed to run spawn next
executable
: %s", UNIT(s)->meta.id, strerror(-r));
+ log_warning("%s failed to run spawn next
task
: %s", UNIT(s)->meta.id, strerror(-r));
if (s->state == SERVICE_START_PRE)
service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
if (s->state == SERVICE_START_PRE)
service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
@@
-2268,7
+2268,7
@@
static int service_enumerate(Manager *m) {
}
if (de->d_name[0] == 'S' &&
}
if (de->d_name[0] == 'S' &&
- (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_
BASIC
))
+ (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_
SYSINIT
))
SERVICE(service)->sysv_start_priority =
MAX(a*10 + b, SERVICE(service)->sysv_start_priority);
SERVICE(service)->sysv_start_priority =
MAX(a*10 + b, SERVICE(service)->sysv_start_priority);
@@
-2287,7
+2287,9
@@
static int service_enumerate(Manager *m) {
if ((r = unit_add_dependency(service, UNIT_BEFORE, runlevel_target, true)) < 0)
goto finish;
if ((r = unit_add_dependency(service, UNIT_BEFORE, runlevel_target, true)) < 0)
goto finish;
- } else if (de->d_name[0] == 'K' && rcnd_table[i].type == RUNLEVEL_DOWN) {
+ } else if (de->d_name[0] == 'K' &&
+ (rcnd_table[i].type == RUNLEVEL_DOWN ||
+ rcnd_table[i].type == RUNLEVEL_SYSINIT)) {
Unit *shutdown_target;
/* We honour K links only for
Unit *shutdown_target;
/* We honour K links only for
@@
-2299,7
+2301,12
@@
static int service_enumerate(Manager *m) {
* really distuingish here
* between the runlevels 0 and
* 6 and just add them to the
* really distuingish here
* between the runlevels 0 and
* 6 and just add them to the
- * special shutdown target. */
+ * special shutdown target. On
+ * SUSE the boot.d/ runlevel
+ * is also used for shutdown,
+ * so we add links for that
+ * too to the shutdown
+ * target.*/
if ((r = manager_load_unit(m, SPECIAL_SHUTDOWN_TARGET, NULL, &shutdown_target)) < 0)
goto finish;
if ((r = manager_load_unit(m, SPECIAL_SHUTDOWN_TARGET, NULL, &shutdown_target)) < 0)
goto finish;