e65ff3b72a
Cherry-picked from upstream. Also applied a fix for the CPUShares configuration option while I'm at it. CVE-2013-4327
26 lines
816 B
Diff
26 lines
816 B
Diff
From 2afcee0b4da066fb5f8fc00b749d88f5bd9df3d3 Mon Sep 17 00:00:00 2001
|
|
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
|
Date: Tue, 8 Jan 2013 15:45:01 +0100
|
|
Subject: [PATCH 02/11] Ignore duplicate paths in "systemctl start"
|
|
|
|
---
|
|
src/systemctl/systemctl.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
|
|
index 3cca861..16791a2 100644
|
|
--- a/src/systemctl/systemctl.c
|
|
+++ b/src/systemctl/systemctl.c
|
|
@@ -1867,7 +1867,7 @@ static int start_unit_one(
|
|
return log_oom();
|
|
|
|
r = set_consume(s, p);
|
|
- if (r < 0) {
|
|
+ if (r < 0 && r != -EEXIST) {
|
|
log_error("Failed to add path to set.");
|
|
return r;
|
|
}
|
|
--
|
|
1.8.3.4
|
|
|