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

Jump to bottom

lib/make-ext4-fs: more efficient store maker #52760

Merged
merged 1 commit into from Jan 3, 2019
Merged

lib/make-ext4-fs: more efficient store maker #52760

merged 1 commit into from Jan 3, 2019

Conversation

akru
Copy link
Contributor

@akru akru commented Dec 24, 2018 •
edited

Motivation for this change

Currently making ext4 for sd_image is too slowly and breaks at paths with spaces. In this proposal I use lkl tool cptofs for ext4 content population.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

samueldr
samueldr reviewed Dec 24, 2018
View reviewed changes
Copy link
Member

@samueldr samueldr left a comment

Choose a reason for hiding this comment

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

I just verified and it generates working images. Just booted a raspberry pi 3B using an image generated using this patch on top of nixos-unstable.

This is almost approved; let's see if we can get rid of debugfs altogether (see the inline comment).

nixos/lib/make-ext4-fs.nix Outdated
# In particular, debugfs doesn't handle absolute target paths; you have to 'cd' in the virtual
# filesystem first. Likewise the intermediate directories must already exist (using `find`
# handles that for us). And when setting the file's permissions, the inode type flags (__S_IFDIR,
# __S_IFREG) need to be set as well.
(
echo write nix-path-registration nix-path-registration
echo mkdir nix
echo cd /nix
echo mkdir store
Copy link
Member

Choose a reason for hiding this comment

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

Can we also get rid of that glorified cp ${sdClosureInfo}/registration [img]/nix-path-registration and mkdir -p [img]/nix/store using lkl?

If so, it would remove the need to go through debugfs altogether, which would be even better.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, was do it.

@matthewbauer matthewbauer merged commit 74312c7 into NixOS:master Jan 3, 2019
@samueldr samueldr mentioned this pull request Feb 13, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer approved these changes

@samueldr samueldr samueldr approved these changes

@dezgeg dezgeg Awaiting requested review from dezgeg

Assignees
No one assigned
Labels
6.topic: nixos 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@akru @matthewbauer @samueldr @GrahamcOfBorg