mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-29 16:40:18 +02:00
a3082bc6b7
It seems nix is much more permissive in applying patches than git am. These patches were regenerated by running `git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`, and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch` where necessary.
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From d96e5224001ea437549eae7b00173b61d459209e 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 06/18] 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 2816bcef55..0e5102a28c 100644
|
|
--- a/src/core/unit.c
|
|
+++ b/src/core/unit.c
|
|
@@ -2043,7 +2043,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.26.2
|
|
|