public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: Update to 195

Browse Source
This commit is contained in:
Eelco Dolstra 2012-10-23 13:51:13 +02:00
parent b91a3927e6
commit 8b9f3e9de4
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/systemd/default.nix
View File

@ -6,17 +6,16 @@
assert stdenv.gcc.libc or null != null; assert stdenv.gcc.libc or null != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "systemd-194"; name = "systemd-195";
src = fetchurl { src = fetchurl {
url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
sha256 = "0cgnnl6kqaz3als5y9g8jvsvbs4c8ccp0vl4s1g8rwk69w2cwxd2"; sha256 = "00v3haymdxhjk71pqp17irw9pm5ivfvz35ibvw41v5zdhj5il179";
}; };
patches = patches =
[ ./reexec.patch [ ./reexec.patch
./ignore-duplicates.patch ./ignore-duplicates.patch
./fix-device-aliases.patch
./crypt-devices-are-ready.patch ./crypt-devices-are-ready.patch
]; ];
@ -68,7 +67,7 @@ stdenv.mkDerivation rec {
makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include"; 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. # Get rid of configuration-specific data.
postInstall = postInstall =

14
pkgs/os-specific/linux/systemd/fix-device-aliases.patch
View File

@ -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);
}
}