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.

Sign up for GitHub

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

Jump to bottom

make-disk-image: fix broken EFI image builds #120251

Merged
merged 1 commit into from Apr 26, 2021
Merged

make-disk-image: fix broken EFI image builds #120251

merged 1 commit into from Apr 26, 2021

Conversation

mschwaig
Copy link
Member

Work around missing /dev files inside runInLinuxVM by creating a
symlink before calling nixos-enter. To be as conservative as possible
the created symlinks are removed again afterwards.

This should fix #93381.
I ran into this issue when trying to create a VMware image that boots from EFI.

Thanks @colemickens for reporting this and @danielfullmer for fixing the same thing in in qemu-vm.nix (37676e7) and explaining what the issue was.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

samueldr
samueldr requested changes Apr 24, 2021
View reviewed changes
nixos/lib/make-disk-image.nix Outdated Show resolved Hide resolved
nixos/lib/make-disk-image.nix Outdated Show resolved Hide resolved
@mschwaig
make-disk-image: fix broken EFI image builds
f20ae95 
Work around missing /dev files inside runInLinuxVM by creating a
symlink before calling nixos-enter.

This fixes NixOS#93381.
I ran into this issue when trying to create a VMware image that boots from EFI.

Thanks @colemickens for reporting this and @danielfullmer for fixing the same thing in in qemu-vm.nix (37676e7) and explaining what the issue was.
@mschwaig mschwaig force-pushed the fix-make-disk-image-for-efi-2 branch from 6b48d59 to f20ae95 Compare April 25, 2021 23:18
Lassulus
Lassulus approved these changes Apr 26, 2021
View reviewed changes
Copy link
Member

@Lassulus Lassulus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@Lassulus Lassulus merged commit cdddbf5 into NixOS:master Apr 26, 2021
@mschwaig mschwaig deleted the fix-make-disk-image-for-efi-2 branch March 23, 2024 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samueldr samueldr samueldr requested changes

@colemickens colemickens colemickens left review comments

@Lassulus Lassulus Lassulus approved these changes

@Ekleog Ekleog Awaiting requested review from Ekleog

Assignees
No one assigned
Labels
6.topic: nixos 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
4 participants
@mschwaig @samueldr @colemickens @Lassulus