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

lvm2: put the profile scripts into etc/profile.d #373288

Merged
merged 4 commits into from
Jan 21, 2025

Conversation

7c6f434c
Copy link
Member

@7c6f434c 7c6f434c commented Jan 12, 2025

Motivation: #369732

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:
    • NixOS test(s) (look inside [nixos/tests](https:// github.com/NixOS/nixpkgs/blob/master/nixos/tests))
    • and/or package tests
    • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
    • made sure NixOS tests are linked to the relevant packages
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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.

@github-actions github-actions bot added 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell 6.topic: qt/kde 6.topic: kernel The Linux kernel 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: rust 6.topic: golang 6.topic: vim 6.topic: erlang 6.topic: ocaml 6.topic: fetch 6.topic: stdenv Standard environment 6.topic: nodejs 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: systemd 6.topic: julia 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: dotnet Language: .NET 6.topic: flutter 6.topic: nvidia labels Jan 12, 2025
@nix-owners
Copy link

nix-owners bot commented Jan 12, 2025

The PR's base branch is set to master, but 1149 commits from the staging branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the staging branch, change the base branch to staging
  • If the changes should go to the master branch, rebase your PR onto the merge base with the master branch:
    # git rebase --onto $(git merge-base upstream/master HEAD) $(git merge-base upstream/staging HEAD)
    git rebase --onto 93dbaf6d1a0385b5a7d9b378db1176b76db622fd e290d236884088ae2f61432eb72b5229ebf0404d
    git push --force-with-lease

@7c6f434c 7c6f434c changed the base branch from master to staging January 12, 2025 21:30
@github-actions github-actions bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell 6.topic: qt/kde labels Jan 12, 2025
@wolfgangwalther
Copy link
Contributor

You still seem to have 11 commits from another branch in this PR. I suggest you rebase interactively and drop them - those are probably commits that were on master already, but didn't make their way to staging at the time, yet.

@Ma27 Ma27 removed their request for review January 13, 2025 11:13
@7c6f434c
Copy link
Member Author

It looks like profile is never mentioned in the same file as lvm2 in the context of etc/profile path (but I am trying to run the tests just in case)

@wolfgangwalther wolfgangwalther removed their request for review January 14, 2025 17:13
@7c6f434c
Copy link
Member Author

Separated reformatting, fixed the reference to tests, asked the original reporter of the bug about how to check if the bug is fixed,

@7c6f434c
Copy link
Member Author

The following is broken on master but works here:

buildFHSEnv {
  name="test"; 
  targetPkgs=p: with p; [lvm2];
}

Copy link
Contributor

@wolfgangwalther wolfgangwalther left a comment

Choose a reason for hiding this comment

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

The following is broken on master but works here:

Confirmed. The resulting -test-fhsenv-rootfs folder structure seems better with profile.d than only with profile.

I did a stupid rg 'etc/profile' -C1000 | rg lvm2 and didn't get any matches. Not a proof, but at least an indication.

@7c6f434c 7c6f434c force-pushed the lvm-profile branch 2 times, most recently from 063d607 to 3f8254e Compare January 21, 2025 20:14
@7c6f434c
Copy link
Member Author

Build failure — an unrelated dependency timeout.

Apparently the fourth commit causes GHA to break down workflow generation??

@wolfgangwalther
Copy link
Contributor

Apparently the fourth commit causes GHA to break down workflow generation??

Funny times :D

@wolfgangwalther
Copy link
Contributor

I think there's some general hiccups with GHA again, looking at the failures on https://github.com/NixOS/nixpkgs/actions

@7c6f434c
Copy link
Member Author

7c6f434c commented Jan 21, 2025

Do they shard by commit hash and some of the shards are broken? (Trying to make sense that rolling back kind of helped)

@wolfgangwalther
Copy link
Contributor

Do they shard by commit hash and some of the shards are broken? (Trying to make sense that rolling back kind of helped)

Interesting idea. In that case amending the commit without changes to get a different hash should help.

@7c6f434c
Copy link
Member Author

Which I did by rewriting a commit message, which seems to have helped…

GHAcoin: rewrite the commit message until your hash hits a good shard!

@wolfgangwalther
Copy link
Contributor

Yeah, worked for me elsewhere, too :D

@7c6f434c 7c6f434c merged commit ea7dd72 into NixOS:staging Jan 21, 2025
23 of 27 checks passed
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.

2 participants