ba770e599c
After patching, this produces exactly the same source code as in our custom fork, but having the actual patches inlined inside nixpkgs makes it easier to get rid of them. In case more complicated rebasing is necessary, maintainers can - Clone the upstream systemd/systemd[-stable] repo - Checkout the current rev mentioned in src - Apply the patches from this folder via `git am 00*.patch` - Rebase the repo on top of a new version - Export the patch series via `git format-patch $newVersion` - Update the patches = [ … ] attribute (if necessary)
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 99c86daa5244d45a19f75f6ce92bd4255edef420 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 09/27] 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/unit.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/core/unit.c b/src/core/unit.c
|
|
index a1dc76aa6a..07670af8e2 100644
|
|
--- a/src/core/unit.c
|
|
+++ b/src/core/unit.c
|
|
@@ -2045,7 +2045,8 @@ static void unit_check_binds_to(Unit *u) {
|
|
}
|
|
|
|
assert(other);
|
|
- log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id);
|
|
+ if (u->type != UNIT_MOUNT || detect_container() <= 0)
|
|
+ log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id);
|
|
|
|
/* A unit we need to run is gone. Sniff. Let's stop this. */
|
|
r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL);
|
|
--
|
|
2.24.1
|
|
|