diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-09-17 11:02:43 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-09-17 12:31:58 +0200 |
commit | 17f58275a05aba98eb644581d557de5c11e3b962 (patch) | |
tree | c18a9994020f61fd5cd1a498a1726e73b1e23407 | |
parent | 8f98226f50e4d8a37b39a4fb5a2a5986b4269080 (diff) | |
download | nixlib-17f58275a05aba98eb644581d557de5c11e3b962.tar nixlib-17f58275a05aba98eb644581d557de5c11e3b962.tar.gz nixlib-17f58275a05aba98eb644581d557de5c11e3b962.tar.bz2 nixlib-17f58275a05aba98eb644581d557de5c11e3b962.tar.lz nixlib-17f58275a05aba98eb644581d557de5c11e3b962.tar.xz nixlib-17f58275a05aba98eb644581d557de5c11e3b962.tar.zst nixlib-17f58275a05aba98eb644581d557de5c11e3b962.zip |
tests/virtualbox: Fix long line in guestAdditions.
This is essentially not only "wrapping" the line but refactoring into a shorter name which is used in two places. And yes, I know I'm very pedantic if it comes to whitespaces and line lengths, but I made sure this doesn't change any functionality: $ nix-instantiate nixos/tests/virtualbox.nix ... /nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv $ git stash pop ... $ nix-instantiate nixos/tests/virtualbox.nix ... /nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv $ Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r-- | nixos/tests/virtualbox.nix | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index b21df456639b..cad1574314ed 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -2,38 +2,40 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let - testVMConfig = vmName: attrs: { config, pkgs, ... }: { - boot.kernelParams = let - miniInit = '' - #!${pkgs.stdenv.shell} -xe - export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin" - - mkdir -p /etc/dbus-1 /var/run/dbus - cat > /etc/passwd <<EOF - root:x:0:0::/root:/bin/false - messagebus:x:1:1::/var/run/dbus:/bin/false - EOF - cat > /etc/group <<EOF - 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.linuxPackages.virtualboxGuestAdditions}/bin/VBoxService - ${(attrs.vmScript or (const "")) pkgs} - - i=0 - while [ ! -e /mnt-root/shutdown ]; do - sleep 10 - i=$(($i + 10)) - [ $i -le 120 ] || fail - done - - rm -f /mnt-root/boot-done /mnt-root/shutdown - ''; - in [ + testVMConfig = vmName: attrs: { config, pkgs, ... }: let + guestAdditions = pkgs.linuxPackages.virtualboxGuestAdditions; + + miniInit = '' + #!${pkgs.stdenv.shell} -xe + export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin" + + mkdir -p /etc/dbus-1 /var/run/dbus + cat > /etc/passwd <<EOF + root:x:0:0::/root:/bin/false + messagebus:x:1:1::/var/run/dbus:/bin/false + EOF + cat > /etc/group <<EOF + 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 + + ${guestAdditions}/bin/VBoxService + ${(attrs.vmScript or (const "")) pkgs} + + i=0 + while [ ! -e /mnt-root/shutdown ]; do + sleep 10 + i=$(($i + 10)) + [ $i -le 120 ] || fail + done + + rm -f /mnt-root/boot-done /mnt-root/shutdown + ''; + in { + boot.kernelParams = [ "console=tty0" "console=ttyS0" "ignore_loglevel" "boot.trace" "panic=1" "boot.panic_on_fail" "init=${pkgs.writeScript "mini-init.sh" miniInit}" @@ -52,7 +54,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let ]; boot.initrd.extraUtilsCommands = '' - copy_bin_and_libs "${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/mount.vboxsf" + copy_bin_and_libs "${guestAdditions}/bin/mount.vboxsf" copy_bin_and_libs "${pkgs.utillinux}/bin/unshare" ${(attrs.extraUtilsCommands or (const "")) pkgs} ''; |