summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch')
-rw-r--r--pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
new file mode 100644
index 000000000000..76160a1f7cc1
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
@@ -0,0 +1,30 @@
+From 2b0a9106d3aabb365af0cc34b595a1e697120f37 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 2/6] Ignore duplicate paths in "systemctl start"
+
+---
+ src/systemctl/systemctl.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
+index 2ebfff8..9f99df5 100644
+--- a/src/systemctl/systemctl.c
++++ b/src/systemctl/systemctl.c
+@@ -1591,8 +1591,11 @@ static int start_unit_one(
+ 
+                 r = set_put(s, p);
+                 if (r < 0) {
+-                        log_error("Failed to add path to set.");
+-                        return r;
++                        free(p);
++                        if (r != -EEXIST) {
++                                log_error("Failed to add path %s to set.", p);
++                                return r;
++                        }
+                 }
+ 
+                 p = NULL;
+-- 
+1.8.0.1
+