diff options
author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-11-01 08:29:09 +0100 |
---|---|---|
committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-11-01 08:29:09 +0100 |
commit | db83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28 (patch) | |
tree | 6a32901d16731d1b109ea218f6360f0deaf7edde /pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch | |
parent | 1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304 (diff) | |
parent | b6519f08da3321a8bc002e6608297a3225cc5439 (diff) | |
download | nixlib-db83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28.tar nixlib-db83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28.tar.gz nixlib-db83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28.tar.bz2 nixlib-db83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28.tar.lz nixlib-db83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28.tar.xz nixlib-db83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28.tar.zst nixlib-db83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28.zip |
Merge branch 'master' into multiple-outputs
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.patch | 25 |
1 files changed, 0 insertions, 25 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 deleted file mode 100644 index 27ac6183efc8..000000000000 --- a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 2/9] 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.2.1 - |