3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs
aszlig 389e654e03
systemd: Backport fix for detecting VirtualBox.
This is a backport of systemd/systemd@e32886e.

As noted by @ts468 in #9876, systemd-detect-virt will report KVM if
we're running inside VirtualBox 5.x. Instead of just disabling the
check, this essentially fixes systemd to be able to detect VirtualBox
again.

Tested this against nixos/tests/simple.nix (just to make sure systemd is
still working) and nixos/tests/virtualbox.nix (all tests succeed).

Thanks a lot to @ts468 for catching this and also to @domenkozar for
testing various things concerning that bug.

Fixes #9876.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 16:02:43 +02:00
..
applications Enable separate debug info 2015-09-17 15:56:33 +02:00
build-support Enable separate debug info 2015-09-17 15:56:33 +02:00
data all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
desktops Remove all references to haskell-ng and haskellngPackages from Nixpkgs. 2015-09-15 16:11:58 +02:00
development gdb: Update to 7.10 2015-09-17 15:56:42 +02:00
games all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
misc vimPlugins: 2015-09-17 update 2015-09-17 00:42:27 +03:00
os-specific systemd: Backport fix for detecting VirtualBox. 2015-09-17 16:02:43 +02:00
servers lighttpd: 1.4.35 -> 1.4.37 2015-09-16 07:46:34 +02:00
shells Merge commit 'a6f6c0e' into master.upstream 2015-09-15 12:16:49 -07:00
stdenv Enable separate debug info 2015-09-17 15:56:33 +02:00
test
tools Enable separate debug info 2015-09-17 15:56:33 +02:00
top-level Enable separate debug info 2015-09-17 15:56:33 +02:00