mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 14:43:37 +00:00
575fddf25b
systemd v253 changelog/NEWS: https://github.com/systemd/systemd/blob/v253/NEWS NixOS changes: 0007-hostnamed-localed-timedated-disable-methods-that-cha.patch was dropped, because systemd gained support to handle read-only /etc. *-add-rootprefix-to-lookup-dir-paths.patch required some updates too, as src/basic/def.h moved to src/basic/constants.h. systemd/systemd#25771 switched p11kit to become dlopen()'ed, so we need to patch that path. added a note to the 23.05 release notes to recommend `nixos-rebuild boot` Co-authored-by: Florian Klink <flokli@flokli.de>
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 7b394794b0..50d092042c 100644
|
|
--- a/src/core/manager.c
|
|
+++ b/src/core/manager.c
|
|
@@ -1437,7 +1437,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. */
|