gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/make-disk-image: fix hybrid and legacy+gpt image generation

Browse Source 
Prevent GNU parted from complaining about misaligned partitions for
partitions that aren't supposed to be aligned.
This commit is contained in:
Jared Baur
2024-12-20 12:58:31 -08:00
parent 81932cf82a
commit bae7a7ac67
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/lib/make-disk-image.nix
View File

@@ -279,10 +279,9 @@ let
"legacy+gpt" = ''
parted --script $diskImage -- \
mklabel gpt \
mkpart no-fs 1MB 2MB \
mkpart no-fs 1MiB 2MiB \
set 1 bios_grub on \
align-check optimal 1 \
mkpart primary ext4 2MB 100% \
mkpart primary ext4 2MiB 100% \
align-check optimal 2 \
print
${lib.optionalString deterministic ''
@@ -340,7 +339,6 @@ let
align-check optimal 1 \
mkpart no-fs 0 1024KiB \
set 2 bios_grub on \
align-check optimal 2 \
mkpart primary ext4 $bootSizeMiB 100% \
align-check optimal 3 \
print
@@ -535,7 +533,7 @@ let
''
# Add the GPT at the end
gptSpace=$(( 512 * 34 * 1 ))
# And include the bios_grub partition; the ext4 partition starts at 2MB exactly.
# And include the bios_grub partition; the ext4 partition starts at 2MiB exactly.
reservedSpace=$(( gptSpace + 2 * mebibyte ))
''
else if partitionTableType == "legacy" then