diff options
author | Florian Klink <flokli@flokli.de> | 2020-06-08 10:46:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-08 10:46:11 +0200 |
commit | 3590f02e7d5760e52072c1a729ee2250b5560746 (patch) | |
tree | 19730222e1ab069eaca99f1723c4564731d762f1 | |
parent | 657f4927ebcde600377a8ef3d7722bc701548e32 (diff) | |
parent | 55912f3535217910b12e81f07fb10d70511a471b (diff) | |
download | nixlib-3590f02e7d5760e52072c1a729ee2250b5560746.tar nixlib-3590f02e7d5760e52072c1a729ee2250b5560746.tar.gz nixlib-3590f02e7d5760e52072c1a729ee2250b5560746.tar.bz2 nixlib-3590f02e7d5760e52072c1a729ee2250b5560746.tar.lz nixlib-3590f02e7d5760e52072c1a729ee2250b5560746.tar.xz nixlib-3590f02e7d5760e52072c1a729ee2250b5560746.tar.zst nixlib-3590f02e7d5760e52072c1a729ee2250b5560746.zip |
Merge pull request #88574 from JJJollyjim/qemu-vm-qboot-opt
nixos/qemu-vm: add option to use qboot
-rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 15 | ||||
-rw-r--r-- | nixos/tests/all-tests.nix | 1 | ||||
-rw-r--r-- | nixos/tests/qboot.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/virtualization/qboot/default.nix | 4 |
4 files changed, 32 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 4592ffcfe4db..b8d0606be7c1 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -441,6 +441,18 @@ in ''; }; + virtualisation.bios = + mkOption { + default = null; + type = types.nullOr types.package; + description = + '' + An alternate BIOS (such as <package>qboot</package>) with which to start the VM. + Should containin a file named <literal>bios.bin</literal>. + If <literal>null</literal>, QEMU's builtin SeaBIOS will be used. + ''; + }; + }; config = { @@ -521,6 +533,9 @@ in (mkIf cfg.useEFIBoot [ "-pflash $TMPDIR/bios.bin" ]) + (mkIf (cfg.bios != null) [ + "-bios ${cfg.bios}/bios.bin" + ]) (mkIf (!cfg.graphics) [ "-nographic" ]) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 796c626f3dde..8e262d8eee7d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -273,6 +273,7 @@ in prosody = handleTest ./xmpp/prosody.nix {}; prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {}; proxy = handleTest ./proxy.nix {}; + qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {}; quagga = handleTest ./quagga.nix {}; quorum = handleTest ./quorum.nix {}; rabbitmq = handleTest ./rabbitmq.nix {}; diff --git a/nixos/tests/qboot.nix b/nixos/tests/qboot.nix new file mode 100644 index 000000000000..12aef6decfae --- /dev/null +++ b/nixos/tests/qboot.nix @@ -0,0 +1,13 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "qboot"; + + machine = { ... }: { + virtualisation.bios = pkgs.qboot; + }; + + testScript = + '' + start_all() + machine.wait_for_unit("multi-user.target") + ''; +}) diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index 800d601c76e6..8d1f9dac2e51 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, fetchFromGitHub }: +{ stdenv, meson, ninja, fetchFromGitHub, nixosTests }: stdenv.mkDerivation { name = "qboot-20200423"; @@ -19,6 +19,8 @@ stdenv.mkDerivation { hardeningDisable = [ "stackprotector" "pic" ]; + passthru.tests = { qboot = nixosTests.qboot; }; + meta = { description = "A simple x86 firmware for booting Linux"; homepage = "https://github.com/bonzini/qboot"; |