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

nixos/incus: add zfs/lib/udev to path #283274

Merged
merged 1 commit into from
Feb 2, 2024

Conversation

adamcstephens
Copy link
Contributor

Description of changes

Incus needs to find zvol_id for some operations, but zfs does not put this executable in the bin directory. Exposing lib/udev into the Incus path solves discovery of the executable

https://github.com/lxc/incus/blob/e5690705e842d3961d8a1d18c0ec002c25345af8/internal/server/storage/drivers/driver_zfs_volumes.go#L1820C1-L1820C41

Closes #283250

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.

@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/` labels Jan 23, 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 labels Jan 23, 2024
@adamcstephens
Copy link
Contributor Author

adamcstephens commented Jan 23, 2024

@ofborg test incus

🍕 🍕 🍕 🍕 🍕

Incus needs to find zvol_id for some operations, but zfs does not put
this executable in the bin directory. Exposing lib/udev into the Incus
path solves discovery of the executable

https://github.com/lxc/incus/blob/e5690705e842d3961d8a1d18c0ec002c25345af8/internal/server/storage/drivers/driver_zfs_volumes.go#L1820C1-L1820C41
@adamcstephens adamcstephens merged commit 237e778 into NixOS:master Feb 2, 2024
8 of 11 checks passed
@adamcstephens adamcstephens deleted the incus/zvol_id branch February 2, 2024 17:57
Copy link
Contributor

github-actions bot commented Feb 3, 2024

Successfully created backport PR for release-23.11:

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 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incus can't find zvol_id
1 participant