646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
|
Date: Mon, 11 May 2015 15:39:38 +0200
|
|
Subject: [PATCH] Get rid of a useless message in user sessions
|
|
|
|
Namely lots of variants of
|
|
|
|
Unit nix-var-nix-db.mount is bound to inactive unit dev-disk-by\x2dlabel-nixos.device. Stopping, too.
|
|
|
|
in containers.
|
|
---
|
|
src/core/manager.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/core/manager.c b/src/core/manager.c
|
|
index 4ccaba9054..9577b89783 100644
|
|
--- a/src/core/manager.c
|
|
+++ b/src/core/manager.c
|
|
@@ -1672,7 +1672,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
|
|
if (!unit_is_bound_by_inactive(u, &culprit))
|
|
continue;
|
|
|
|
- log_unit_debug(u, "Unit is stopped because bound to inactive unit %s.", culprit->id);
|
|
+ if (u->type != UNIT_MOUNT || detect_container() <= 0)
|
|
+ log_unit_debug(u, "Unit is stopped because bound to inactive unit %s.", culprit->id);
|
|
|
|
/* If stopping a unit fails continuously we might enter a stop loop here, hence stop acting on the
|
|
* service being unnecessary after a while. */
|