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

filesystems: Add autoResize assertion #57751

Merged
merged 1 commit into from Mar 22, 2019
Merged

filesystems: Add autoResize assertion #57751

merged 1 commit into from Mar 22, 2019

Conversation

talyz
Copy link
Contributor

@talyz talyz commented Mar 16, 2019

Motivation for this change

Assert that autoResize is only used when fsType is explicitly set to a
supported filesystem: if it's set to "auto", the default, the required
resizing tools won't be copied into the initrd even if the actual
filesystem is supported.

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.

Assert that autoResize is only used when fsType is explicitly set to a
supported filesystem: if it's set to "auto", the default, the required
resizing tools won't be copied into the initrd even if the actual
filesystem is supported.
@nlewo
Copy link
Member

nlewo commented Mar 22, 2019

I don't know why you are handling fs2fs as well since it seems to me resizing tools are only imported for ext* FS: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/boot/stage-1.nix#L131

@talyz
Copy link
Contributor Author

talyz commented Mar 22, 2019

Confusingly enough, resizing tools are imported for f2fs, but not in stage-1.nix: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/tasks/filesystems/f2fs.nix

@nlewo
Copy link
Member

nlewo commented Mar 22, 2019

@talyz ok, thanks!
BTW, would be nice to centralize this...

@nlewo nlewo merged commit c8a65c2 into NixOS:master Mar 22, 2019
pull bot pushed a commit to evanjs/nixpkgs that referenced this pull request Mar 25, 2019
This otherwise does not eval `:tested` any more, which means no nixos
channel updates.

Regression comes from 0eb6d07 (NixOS#57751)
which added an assertion stopping the use of `autoResize` when the
filesystem cannot be resized automatically.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants