summary refs log tree commit diff
path: root/nixos/modules/virtualisation/virtualbox-image.nix
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2017-12-07 02:00:21 +0200
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2018-01-22 11:18:23 +0200
commit962e79ef32c95435eca1c84856fdc9941ce06720 (patch)
tree4efe7988be7c5a67cf210072000f686885033dee /nixos/modules/virtualisation/virtualbox-image.nix
parent73695300bc0ad15d01e5ac52329b9668b1a33704 (diff)
downloadnixpkgs-962e79ef32c95435eca1c84856fdc9941ce06720.tar
nixpkgs-962e79ef32c95435eca1c84856fdc9941ce06720.tar.gz
nixpkgs-962e79ef32c95435eca1c84856fdc9941ce06720.tar.bz2
nixpkgs-962e79ef32c95435eca1c84856fdc9941ce06720.tar.lz
nixpkgs-962e79ef32c95435eca1c84856fdc9941ce06720.tar.xz
nixpkgs-962e79ef32c95435eca1c84856fdc9941ce06720.tar.zst
nixpkgs-962e79ef32c95435eca1c84856fdc9941ce06720.zip
nixos/make-disk-image.nix: Support EFI images
- Add a new parameter `imageType` that can specify either "efi" or
  "legacy" (the default which should see no change in behaviour by
  this patch).

- EFI images get a GPT partition table (instead of msdos) with a
  mandatory ESP partition (so we add an assert that `partitioned`
  is true).

- Use the partx tool from util-linux to determine exact start + size
  of the root partition. This is required because GPT stores a secondary
  partition table at the end of the disk, so we can't just have
  mkfs.ext4 create the filesystem until the end of the disk.

- (Unrelated to any EFI changes) Since we're depending on the
  `-E offset=X` option to mkfs which is only supported by e2fsprogs,
  disallow any attempts of creating partitioned disk images where
  the root filesystem is not ext4.
Diffstat (limited to 'nixos/modules/virtualisation/virtualbox-image.nix')
-rw-r--r--nixos/modules/virtualisation/virtualbox-image.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 00381c426d2..a544403e6be 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -25,7 +25,7 @@ in {
       name = "nixos-ova-${config.system.nixosLabel}-${pkgs.stdenv.system}";
 
       inherit pkgs lib config;
-      partitioned = true;
+      partitionTableType = "legacy";
       diskSize = cfg.baseImageSize;
 
       postVM =