From 0dfb9ecc359ede45fc14ad3b871c0d1735e125f7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 May 2013 14:05:28 +0200 Subject: [PATCH] systemd: Update to 203 --- ...aemon-reexec-do-the-right-thing-on-N.patch | 8 ++--- ...e-duplicate-paths-in-systemctl-start.patch | 30 ++++++++----------- ...ts-for-uninitialised-encrypted-devic.patch | 4 +-- ...o-configuration-hints-for-some-units.patch | 8 ++--- ...rop-the-dependency-on-local-fs.targe.patch | 4 +-- .../0006-Don-t-call-plymouth-quit.patch | 4 +-- ...007-Ignore-IPv6-link-local-addresses.patch | 4 +-- ...on-t-try-to-unmount-nix-or-nix-store.patch | 6 ++-- pkgs/os-specific/linux/systemd/default.nix | 4 +-- 9 files changed, 34 insertions(+), 38 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch index 7324325fad4..e3a2f969273 100644 --- a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch +++ b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch @@ -1,4 +1,4 @@ -From d9c2065158b63db16c9bf0fed37b3f759ef85cbd Mon Sep 17 00:00:00 2001 +From 8f861550827e750fb56954c3f91a2f565abb42bb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:44:33 +0100 Subject: [PATCH 1/8] Make "systemctl daemon-reexec" do the right thing on @@ -9,10 +9,10 @@ Subject: [PATCH 1/8] Make "systemctl daemon-reexec" do the right thing on 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/main.c b/src/core/main.c -index 7899761..f6f83f4 100644 +index 7fc06be..7575223 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1884,7 +1884,7 @@ finish: +@@ -1857,7 +1857,7 @@ finish: char_array_0(sfd); i = 0; @@ -22,5 +22,5 @@ index 7899761..f6f83f4 100644 args[i++] = "--switched-root"; args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user"; -- -1.8.1 +1.8.2.1 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 31a6642978b..a68973e7895 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,29 +1,25 @@ -From f3838af51d461ca3d339618d17962f2d57d1a7fa Mon Sep 17 00:00:00 2001 +From 2afcee0b4da066fb5f8fc00b749d88f5bd9df3d3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:45:01 +0100 Subject: [PATCH 2/8] Ignore duplicate paths in "systemctl start" --- - src/systemctl/systemctl.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) + 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 fd9f580..b8252c9 100644 +index 3cca861..16791a2 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c -@@ -1507,8 +1507,10 @@ static int start_unit_one( - r = set_put(s, p); - if (r < 0) { - free(p); -- log_error("Failed to add path to set."); -- return r; -+ if (r != -EEXIST) { -+ log_error("Failed to add path %s to set.", p); -+ return r; -+ } - } - } +@@ -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.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch index 30382f55758..ee95a33839f 100644 --- a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,4 +1,4 @@ -From 6960f2025e95e69079540c4828f62e16d7e75fb1 Mon Sep 17 00:00:00 2001 +From b288ca7d376e3a78368a2b59529ebe5ba812babf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:46:30 +0100 Subject: [PATCH 3/8] Start device units for uninitialised encrypted devices @@ -28,5 +28,5 @@ index d17bdd9..040b10e 100644 SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0" SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0" -- -1.8.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch index 610f8a1de63..a060a1bbce5 100644 --- a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch +++ b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch @@ -1,4 +1,4 @@ -From 22d416e766e11dbc381620beff89284a0e23827b Mon Sep 17 00:00:00 2001 +From 7a498e661f3d111fa09700a6cfa62cfd6733b1cc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:48:19 +0100 Subject: [PATCH 4/8] Set switch-to-configuration hints for some units @@ -34,12 +34,12 @@ index 18c3d74..a09054c 100644 + +X-StopOnReconfiguration=yes diff --git a/units/remote-fs.target b/units/remote-fs.target -index e867b8d..02462b4 100644 +index 09213e8..47b4cf5 100644 --- a/units/remote-fs.target +++ b/units/remote-fs.target @@ -10,5 +10,7 @@ Description=Remote File Systems Documentation=man:systemd.special(7) - After=remote-fs-pre.target remote-fs-setup.target + After=remote-fs-pre.target +X-StopOnReconfiguration=yes + @@ -70,5 +70,5 @@ index 0869e73..b6ed958 100644 +# Restart kills all active sessions. +X-RestartIfChanged=no -- -1.8.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch index 1f6da920091..6905b507c74 100644 --- a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch +++ b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch @@ -1,4 +1,4 @@ -From 4b0a5f8b3f8fed53f34021dd6139699740b0c3ff Mon Sep 17 00:00:00 2001 +From e6bbe5fa858bd8196c8e1f264904679e6bda426d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:56:03 +0100 Subject: [PATCH 5/8] sysinit.target: Drop the dependency on local-fs.target @@ -29,5 +29,5 @@ index 8f4fb8f..e0f0147 100644 +After=emergency.service emergency.target RefuseManualStart=yes -- -1.8.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch index f56d6cc41be..8dca3cb0e8c 100644 --- a/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch +++ b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch @@ -1,4 +1,4 @@ -From fbb62c4d5973f7556ce6c3bc9242180b7e087de8 Mon Sep 17 00:00:00 2001 +From 4731a9074538e9e24d2b81fc737917b064e194e6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 18:36:28 +0100 Subject: [PATCH 6/8] Don't call "plymouth quit" @@ -34,5 +34,5 @@ index 269797a..2c640f4 100644 ExecStart=-/sbin/sulogin ExecStopPost=-@SYSTEMCTL@ --fail --no-block default -- -1.8.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch index f1206171547..9fdb454a2a9 100644 --- a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch +++ b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch @@ -1,4 +1,4 @@ -From 72a89fd9b4e35da375a1cdcf0d30a0f31a78d9a5 Mon Sep 17 00:00:00 2001 +From f0c362873860526579bf9bda216005fd5a0936dd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Feb 2013 12:41:14 +0100 Subject: [PATCH 7/8] Ignore IPv6 link-local addresses @@ -33,5 +33,5 @@ index b1ef912..4f2ab5c 100644 continue; -- -1.8.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch index c8959871c00..d8384e1332a 100644 --- a/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,4 +1,4 @@ -From ceb0fc701960de1568fe2732f390a7b92b76f2e1 Mon Sep 17 00:00:00 2001 +From 0112df74e576dd683c132ec33861b7099dc94454 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Apr 2013 13:16:57 +0200 Subject: [PATCH 8/8] Don't try to unmount /nix or /nix/store @@ -11,7 +11,7 @@ https://github.com/NixOS/nixos/issues/126 1 file changed, 2 insertions(+) diff --git a/src/core/umount.c b/src/core/umount.c -index 8c69e74..ff13a5d 100644 +index 1e95ad7..9f0e471 100644 --- a/src/core/umount.c +++ b/src/core/umount.c @@ -435,6 +435,8 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e @@ -24,5 +24,5 @@ index 8c69e74..ff13a5d 100644 || path_equal(m->path, "/usr") #endif -- -1.8.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 35b35d4e6fa..995049fcf6d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,11 +6,11 @@ assert stdenv.gcc.libc or null != null; stdenv.mkDerivation rec { - name = "systemd-201"; + name = "systemd-203"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "046cr1q7xv7bslzc16g8zz8nddf64lw8v01isw1204n21cd9yafn"; + sha256 = "07gvn3rpski8sh1nz16npjf2bvj0spsjdwc5px9685g2pi6kxcb1"; }; patches =