Merge pull request #1049 from flyingcircusio/PL-132780-image-bootstrap

images.fc: fix opening with kernel 5.15
flyingcircusio · Jul 4, 2024 · e4b5a68 · e4b5a68
2 parents 7cc3ddf + f396550
commit e4b5a68
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/release/make-disk-image.nix b/release/make-disk-image.nix
@@ -113,12 +113,13 @@ let format' = format; in let
       # mkfs.xfs does not support --offset, so we must place a separately
       # generated XFS image into the main disk image.
       truncate -s ''${sizeMB}M rootfs.img
-      mkfs.xfs -L ${rootLabel} rootfs.img
+      # TODO: nrext64 can be enabled again once we are at kernel >= 6.5 in the VMs
+      mkfs.xfs -i nrext64=0 -L ${rootLabel} rootfs.img
       dd if=rootfs.img of=$diskImage bs=1M seek=$startMB count=$sizeMB \
         conv=sparse,notrunc iflag=direct
       rm rootfs.img
     '' else ''
-      mkfs.xfs -L ${rootLabel} $diskImage
+      mkfs.xfs -i nrext64=0 -L ${rootLabel} $diskImage
     ''}
 
     root="$PWD/root"