diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-30 11:17:30 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-30 11:26:39 +0200 |
| commit | 8c75ae38386a659f5e5a5dfbada9b5b614faacde (patch) | |
| tree | e916c2fd560a89c8e1e300e3671e5254aaade1f5 /nixos/modules/installer | |
| parent | 956f464fff861cee4a38945b20d9fc12c00f99ec (diff) | |
| download | nixlib-8c75ae38386a659f5e5a5dfbada9b5b614faacde.tar nixlib-8c75ae38386a659f5e5a5dfbada9b5b614faacde.tar.gz nixlib-8c75ae38386a659f5e5a5dfbada9b5b614faacde.tar.bz2 nixlib-8c75ae38386a659f5e5a5dfbada9b5b614faacde.tar.lz nixlib-8c75ae38386a659f5e5a5dfbada9b5b614faacde.tar.xz nixlib-8c75ae38386a659f5e5a5dfbada9b5b614faacde.tar.zst nixlib-8c75ae38386a659f5e5a5dfbada9b5b614faacde.zip | |
nixos-generate-config: Use systemd-detect-virt instead of dmidecode
Dmidecode fails in our EFI test with the error "SMBIOS entry point missing". But we don't need dmidecode because we have already have systemd-detect-virt.
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 7 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/tools.nix | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 89f112cc6bf0..b1958f32e55c 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -218,18 +218,19 @@ foreach my $path (glob "/sys/class/block/*") { } -my $dmi = `@dmidecode@/sbin/dmidecode`; +my $virt = `systemd-detect-virt`; +chomp $virt; # Check if we're a VirtualBox guest. If so, enable the guest # additions. -if ($dmi =~ /Manufacturer: innotek/) { +if ($virt eq "oracle") { push @attrs, "services.virtualbox.enable = true;" } # Likewise for QEMU. -if ($dmi =~ /Manufacturer: Bochs/) { +if ($virt eq "qemu" || $virt eq "kvm" || $virt eq "bochs") { push @imports, "<nixpkgs/nixos/modules/profiles/qemu-guest.nix>"; } diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 7dbcc261485d..5ebf05e340f9 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -38,7 +38,6 @@ let name = "nixos-generate-config"; src = ./nixos-generate-config.pl; perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; - inherit (pkgs) dmidecode; }; nixos-option = makeProg { |