You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
39 lines
1.4 KiB
39 lines
1.4 KiB
From 95216d7246fe5e8ac404cc9d432072eb59f2af04 Mon Sep 17 00:00:00 2001 |
|
From: Colin Walters <walters@verbum.org> |
|
Date: Tue, 17 Feb 2015 13:47:34 -0500 |
|
Subject: [PATCH] unit: When stopping due to BindsTo=, log which unit caused it |
|
|
|
I'm trying to track down a relatively recent change in systemd |
|
which broke OSTree; see https://bugzilla.gnome.org/show_bug.cgi?id=743891 |
|
|
|
Systemd started to stop sysroot.mount, and this patch should help |
|
me debug why at least. |
|
|
|
While we're here, "break" on the first unit we find that will |
|
deactivate, as there's no point in further iteration. |
|
|
|
(cherry picked from commit 98f738b62047229af4a929d7996e2ab04253b02c) |
|
--- |
|
src/core/unit.c | 4 +++- |
|
1 file changed, 3 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/src/core/unit.c b/src/core/unit.c |
|
index 9f1e55e2f..563f6fe85 100644 |
|
--- a/src/core/unit.c |
|
+++ b/src/core/unit.c |
|
@@ -1648,12 +1648,14 @@ static void unit_check_binds_to(Unit *u) { |
|
continue; |
|
|
|
stop = true; |
|
+ break; |
|
} |
|
|
|
if (!stop) |
|
return; |
|
|
|
- log_unit_info(u->id, "Unit %s is bound to inactive unit. Stopping, too.", u->id); |
|
+ assert(other); |
|
+ log_unit_info(u->id, "Unit %s is bound to inactive unit %s. Stopping, too.", u->id, other->id); |
|
|
|
/* A unit we need to run is gone. Sniff. Let's stop this. */ |
|
manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, true, NULL, NULL);
|
|
|