Skip to content

nixos/systemd-stage-1: Fix fsck.xfs needing bash's sh symlink#309236

Merged
drupol merged 2 commits intoNixOS:masterfrom
ElvishJerricco:sd-s1-fix-xfs-fsck
May 18, 2024
Merged

nixos/systemd-stage-1: Fix fsck.xfs needing bash's sh symlink#309236
drupol merged 2 commits intoNixOS:masterfrom
ElvishJerricco:sd-s1-fix-xfs-fsck

Conversation

@ElvishJerricco
Copy link
Copy Markdown
Contributor

@ElvishJerricco ElvishJerricco commented May 5, 2024

Description of changes

Apparently we broke fsck.xfs in #299717. By removing ${bash}/bin and replacing it with ${runtimeShell}, we lost ${bash}/bin/sh, which fsck.xfs relies on. I figure it's probably not the only one, so better to just add it back than try to fix xfs.

I also decided to enable the LVM installer test for sd-initrd because it's the only one already there using XFS, so this let me verify that fsck is indeed fixed with this change.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ElvishJerricco ElvishJerricco requested a review from a team as a code owner May 5, 2024 10:08
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. labels May 5, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 5, 2024
@drupol drupol merged commit aa5d9c3 into NixOS:master May 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants