Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

images.fc: fix opening with kernel 5.15 #1049

Merged
merged 1 commit into from
Jul 4, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions release/make-disk-image.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading