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/systemd-initrd: add missing kmod-blacklist src #348505

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

katexochen
Copy link
Contributor

@katexochen katexochen commented Oct 14, 2024

The file that is currently created is empty as src is missing.

cc @msanft

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.11 Release Notes (or backporting 23.11 and 24.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.

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
@ElvishJerricco
Copy link
Contributor

Whoa. I wonder how that happened. We should probably take this opportunity to review that perl oneliner. I have no idea what good it's doing, and it appears to be an unexplained relic from 10 years ago 0aa2c1d

@katexochen
Copy link
Contributor Author

katexochen commented Oct 17, 2024

chatgpt: This command is reading the entire content of the source file ($src), searching for text that starts with ## file: iwlwifi.conf, followed by any characters (across multiple lines), and ending with ##. It then replaces that entire section with just ##. The processed content is written to a new file ($out).

I'd guess the initial intention was to remove the section of ## file: iwlwifi.conf up to the next ## file: ..., which does nothing right now because there is no other section after.

As it is currently doing nothing, we should be fine with removing it. Not sure we still want to remove the section, I don't think the referenced paths are available:

# /etc/modprobe.d/iwlwifi.conf
# iwlwifi will dyamically load either iwldvm or iwlmvm depending on the
# microcode file installed on the system.  When removing iwlwifi, first
# remove the iwl?vm module and then iwlwifi.
remove iwlwifi \
(/run/booted-system/sw/bin/lsmod | /run/booted-system/sw/bin/grep -o -e ^iwlmvm -e ^iwldvm -e ^iwlwifi | /run/booted-system/sw/bin/xargs /run/booted-system/sw/bin/rmmod) \
&& /run/booted-system/sw/bin/modprobe -r mac80211

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