From 0ba1ea81220ee0ef29c151c97036ffc2dc278dbd Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 24 Oct 2016 12:43:42 +0200 Subject: [PATCH] virtualbox-{systemd-detect-virt,net-hostonlyif} test: fix dbus socket dir The test complains[1][2] that Failed to start message bus: Failed to bind socket "/run/dbus/system_bus_socket": No such file or directory In 639e5401ff51d4c0075b5ceffcbdbfec64c67db3, the dbus socket dir is set to `/run/dbus`; in the test vm `/var/run/dbus` is used, but the standard `/run -> /var/run` link is typically not created until stage 2 init, not in the minimal init used here. Thus, dbus fails to run within the test environment . Fix by changing `/var/run/dbus` to simply `/run/dbus`. [1]: https://hydra.nixos.org/build/42534725 [2]: https://hydra.nixos.org/build/42523834 (cherry picked from commit c86fe2224e09b2ebb30c98de0b17b72147d7d226) --- nixos/tests/virtualbox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 66f16ed8bcc5c0..02a8fc680280ed 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -11,10 +11,10 @@ let #!${pkgs.stdenv.shell} -xe export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.utillinux ]}" - mkdir -p /var/run/dbus + mkdir -p /run/dbus cat > /etc/passwd < /etc/group <