diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-05-26 16:45:43 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-05-26 16:48:32 +0200 |
| commit | 3b8a2a793c63d54229af5fe7eb1e11bc12720919 (patch) | |
| tree | 24ce8d3637c23a5a8084aaedc410df9ac6e23104 /nixos/tests/virtualbox.nix | |
| parent | 3fd3911105c9d5e9339ce630d37952b2ef7ca407 (diff) | |
nixos/tests/vbox: Fix invocation of dbus
VBoxService needs dbus in order to work properly, which failed to start up so far, because it was searching in /run/current-system/sw for its configuration files. We now no longer run with the --system flag but specify the configuration file directly instead. This fixes at least the "simple-gui" test and probably the others as well, which I haven't tested yet. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos/tests/virtualbox.nix')
| -rw-r--r-- | nixos/tests/virtualbox.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 818e3b8a88a04..e9bc14a6cdb4f 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -11,7 +11,7 @@ let #!${pkgs.stdenv.shell} -xe export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin" - mkdir -p /etc/dbus-1 /var/run/dbus + mkdir -p /var/run/dbus cat > /etc/passwd <<EOF root:x:0:0::/root:/bin/false messagebus:x:1:1::/var/run/dbus:/bin/false @@ -20,9 +20,9 @@ let root:x:0: messagebus:x:1: EOF - cp -v "${pkgs.dbus.daemon}/etc/dbus-1/system.conf" \ - /etc/dbus-1/system.conf - "${pkgs.dbus.daemon}/bin/dbus-daemon" --fork --system + + "${pkgs.dbus.daemon}/bin/dbus-daemon" --fork \ + --config-file="${pkgs.dbus.daemon}/share/dbus-1/system.conf" ${guestAdditions}/bin/VBoxService ${(attrs.vmScript or (const "")) pkgs} |