chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ask-password: supported plymouth cached passwords
[elogind.git]
/
src
/
unit.c
diff --git
a/src/unit.c
b/src/unit.c
index 7d673e138d291340b7eb334ea620bf51eb8060c7..0d5312376c2b547234dafce07349b5cd526ca8d0 100644
(file)
--- a/
src/unit.c
+++ b/
src/unit.c
@@
-556,8
+556,12
@@
int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
if (c->std_output != EXEC_OUTPUT_KMSG &&
c->std_output != EXEC_OUTPUT_SYSLOG &&
if (c->std_output != EXEC_OUTPUT_KMSG &&
c->std_output != EXEC_OUTPUT_SYSLOG &&
+ c->std_output != EXEC_OUTPUT_KMSG_AND_CONSOLE &&
+ c->std_output != EXEC_OUTPUT_SYSLOG_AND_CONSOLE &&
c->std_error != EXEC_OUTPUT_KMSG &&
c->std_error != EXEC_OUTPUT_KMSG &&
- c->std_error != EXEC_OUTPUT_SYSLOG)
+ c->std_error != EXEC_OUTPUT_SYSLOG_AND_CONSOLE &&
+ c->std_error != EXEC_OUTPUT_KMSG &&
+ c->std_error != EXEC_OUTPUT_SYSLOG_AND_CONSOLE)
return 0;
/* If syslog or kernel logging is requested, make sure our own
return 0;
/* If syslog or kernel logging is requested, make sure our own
@@
-1067,7
+1071,7
@@
static void retroactively_stop_dependencies(Unit *u) {
unit_check_unneeded(other);
}
unit_check_unneeded(other);
}
-void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
+void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns
, bool reload_success
) {
dual_timestamp ts;
bool unexpected;
dual_timestamp ts;
bool unexpected;
@@
-1134,7
+1138,7
@@
void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
if (u->meta.job->state == JOB_RUNNING) {
if (ns == UNIT_ACTIVE)
if (u->meta.job->state == JOB_RUNNING) {
if (ns == UNIT_ACTIVE)
- job_finish_and_invalidate(u->meta.job,
true
);
+ job_finish_and_invalidate(u->meta.job,
reload_success
);
else if (ns != UNIT_ACTIVATING && ns != UNIT_RELOADING) {
unexpected = true;
else if (ns != UNIT_ACTIVATING && ns != UNIT_RELOADING) {
unexpected = true;
@@
-1194,7
+1198,7
@@
void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
/* The bus just might have become available,
* hence try to connect to it, if we aren't
* yet connected. */
/* The bus just might have become available,
* hence try to connect to it, if we aren't
* yet connected. */
- bus_init(u->meta.manager);
+ bus_init(u->meta.manager
, true
);
if (unit_has_name(u, SPECIAL_SYSLOG_SERVICE))
/* The syslog daemon just might have become
if (unit_has_name(u, SPECIAL_SYSLOG_SERVICE))
/* The syslog daemon just might have become