diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-23 13:51:13 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-23 13:51:13 +0200 |
| commit | 8b9f3e9de4b5566a8f6d3993a6a99ea3e804b63c (patch) | |
| tree | b1776e858a720ef79a6205278b1fbda575a8f1aa /pkgs/os-specific/linux/systemd | |
| parent | b91a3927e6fa577b7e448e86e03c91098262e6c2 (diff) | |
| download | nixlib-8b9f3e9de4b5566a8f6d3993a6a99ea3e804b63c.tar nixlib-8b9f3e9de4b5566a8f6d3993a6a99ea3e804b63c.tar.gz nixlib-8b9f3e9de4b5566a8f6d3993a6a99ea3e804b63c.tar.bz2 nixlib-8b9f3e9de4b5566a8f6d3993a6a99ea3e804b63c.tar.lz nixlib-8b9f3e9de4b5566a8f6d3993a6a99ea3e804b63c.tar.xz nixlib-8b9f3e9de4b5566a8f6d3993a6a99ea3e804b63c.tar.zst nixlib-8b9f3e9de4b5566a8f6d3993a6a99ea3e804b63c.zip | |
systemd: Update to 195
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/systemd/fix-device-aliases.patch | 14 |
2 files changed, 3 insertions, 18 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index cd9cc2dae2cb..1da64199179a 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,17 +6,16 @@ assert stdenv.gcc.libc or null != null; stdenv.mkDerivation rec { - name = "systemd-194"; + name = "systemd-195"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "0cgnnl6kqaz3als5y9g8jvsvbs4c8ccp0vl4s1g8rwk69w2cwxd2"; + sha256 = "00v3haymdxhjk71pqp17irw9pm5ivfvz35ibvw41v5zdhj5il179"; }; patches = [ ./reexec.patch ./ignore-duplicates.patch - ./fix-device-aliases.patch ./crypt-devices-are-ready.patch ]; @@ -68,7 +67,7 @@ stdenv.mkDerivation rec { makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include"; - installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc"; + installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc sysvinitdir=$(TMPDIR)/etc/init.d"; # Get rid of configuration-specific data. postInstall = diff --git a/pkgs/os-specific/linux/systemd/fix-device-aliases.patch b/pkgs/os-specific/linux/systemd/fix-device-aliases.patch deleted file mode 100644 index 508fd0ec0749..000000000000 --- a/pkgs/os-specific/linux/systemd/fix-device-aliases.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/core/device.c b/src/core/device.c -index 5307341..7bbe99a 100644 ---- a/src/core/device.c -+++ b/src/core/device.c -@@ -255,8 +255,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p - if (!is_path(alias)) - log_warning("SYSTEMD_ALIAS for %s is not a path, ignoring: %s", sysfs, alias); - else { -- if ((r = device_add_escaped_name(u, alias)) < 0) -- goto fail; -+ device_update_unit(m, dev, alias, false); - } - } - |