forked from mirrors/nixpkgs
e65ff3b72a
Cherry-picked from upstream. Also applied a fix for the CPUShares configuration option while I'm at it. CVE-2013-4327
27 lines
911 B
Diff
27 lines
911 B
Diff
From 8f861550827e750fb56954c3f91a2f565abb42bb Mon Sep 17 00:00:00 2001
|
|
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
|
Date: Tue, 8 Jan 2013 15:44:33 +0100
|
|
Subject: [PATCH 01/11] Make "systemctl daemon-reexec" do the right thing on
|
|
NixOS
|
|
|
|
---
|
|
src/core/main.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/core/main.c b/src/core/main.c
|
|
index 7fc06be..7575223 100644
|
|
--- a/src/core/main.c
|
|
+++ b/src/core/main.c
|
|
@@ -1857,7 +1857,7 @@ finish:
|
|
char_array_0(sfd);
|
|
|
|
i = 0;
|
|
- args[i++] = SYSTEMD_BINARY_PATH;
|
|
+ args[i++] = "/run/current-system/systemd/lib/systemd/systemd";
|
|
if (switch_root_dir)
|
|
args[i++] = "--switched-root";
|
|
args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user";
|
|
--
|
|
1.8.3.4
|
|
|