diff options
| author | Graham Christensen <graham@grahamc.com> | 2020-10-28 15:53:10 -0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2020-10-30 15:50:24 -0400 |
| commit | d78aa080f5ba5f0920dd3e8a212c8c02cde411a3 (patch) | |
| tree | 71b6bbc00c0a599605b718980e25d640f3ab8ed6 /nixos | |
| parent | 5b8a0f09787c3204277cb15d21f7f17b6fb6beee (diff) | |
| download | nixpkgs-d78aa080f5ba5f0920dd3e8a212c8c02cde411a3.tar nixpkgs-d78aa080f5ba5f0920dd3e8a212c8c02cde411a3.tar.gz nixpkgs-d78aa080f5ba5f0920dd3e8a212c8c02cde411a3.tar.bz2 nixpkgs-d78aa080f5ba5f0920dd3e8a212c8c02cde411a3.tar.lz nixpkgs-d78aa080f5ba5f0920dd3e8a212c8c02cde411a3.tar.xz nixpkgs-d78aa080f5ba5f0920dd3e8a212c8c02cde411a3.tar.zst nixpkgs-d78aa080f5ba5f0920dd3e8a212c8c02cde411a3.zip | |
make-disk-image: support legacy+gpt
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/make-disk-image.nix | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 8aa606a56af..a4a488a1b3e 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -28,6 +28,9 @@ # partition of reasonable size is created in addition to the root partition. # For "legacy", the msdos partition table is used and a single large root # partition is created. + # For "legacy+gpt", the GPT partition table is used, a 1MiB no-fs partition for + # use by the bootloader is created, and a single large root partition is + # created. # For "hybrid", the GPT partition table is used and a mandatory ESP # partition of reasonable size is created in addition to the root partition. # Also a legacy MBR will be present. @@ -54,7 +57,7 @@ format ? "raw" }: -assert partitionTableType == "legacy" || partitionTableType == "efi" || partitionTableType == "hybrid" || partitionTableType == "none"; +assert partitionTableType == "legacy" || partitionTableType == "legacy+gpt" || partitionTableType == "efi" || partitionTableType == "hybrid" || partitionTableType == "none"; # We use -E offset=X below, which is only supported by e2fsprogs assert partitionTableType != "none" -> fsType == "ext4"; @@ -75,6 +78,7 @@ let format' = format; in let rootPartition = { # switch-case legacy = "1"; + "legacy+gpt" = "2"; efi = "2"; hybrid = "3"; }.${partitionTableType}; @@ -85,6 +89,16 @@ let format' = format; in let mklabel msdos \ mkpart primary ext4 1MiB -1 ''; + "legacy+gpt" = '' + parted --script $diskImage -- \ + mklabel gpt \ + mkpart no-fs 1MB 2MB \ + set 1 bios_grub on \ + align-check optimal 1 \ + mkpart primary ext4 2MB -1 \ + align-check optimal 2 \ + print + ''; efi = '' parted --script $diskImage -- \ mklabel gpt \ |