diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-04-12 14:31:53 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-04-12 14:33:41 +0200 |
| commit | 4a429f5276686ede8e79cea074cb081b7a06f1b6 (patch) | |
| tree | 687f538f0be9bf00363f443ba025a8ecd640ca8f /pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch | |
| parent | ec8a661bf4f8538fd38352cda13b429b431e3364 (diff) | |
| download | nixlib-4a429f5276686ede8e79cea074cb081b7a06f1b6.tar nixlib-4a429f5276686ede8e79cea074cb081b7a06f1b6.tar.gz nixlib-4a429f5276686ede8e79cea074cb081b7a06f1b6.tar.bz2 nixlib-4a429f5276686ede8e79cea074cb081b7a06f1b6.tar.lz nixlib-4a429f5276686ede8e79cea074cb081b7a06f1b6.tar.xz nixlib-4a429f5276686ede8e79cea074cb081b7a06f1b6.tar.zst nixlib-4a429f5276686ede8e79cea074cb081b7a06f1b6.zip | |
systemd: Update to 201
Fixes NixOS/nixos#135 and NixOS/nixos#126.
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 | 8 |
1 files changed, 4 insertions, 4 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 index c9e9d806eb9e..31a6642978b2 100644 --- 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 @@ -1,17 +1,17 @@ -From b8acf19dbd37f801d5eeb76170f84bc8d75e464c Mon Sep 17 00:00:00 2001 +From f3838af51d461ca3d339618d17962f2d57d1a7fa 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/7] Ignore duplicate paths in "systemctl start" +Subject: [PATCH 2/8] Ignore duplicate paths in "systemctl start" --- src/systemctl/systemctl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 1191c7a..4cd64f5 100644 +index fd9f580..b8252c9 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c -@@ -1510,8 +1510,10 @@ static int start_unit_one( +@@ -1507,8 +1507,10 @@ static int start_unit_one( r = set_put(s, p); if (r < 0) { free(p); |