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

Minor initrd improvements #47665

Merged
merged 1 commit into from Jan 7, 2019

Conversation

Projects
None yet
8 participants
@erikarvstedt
Copy link
Contributor

erikarvstedt commented Oct 2, 2018

No description provided.

nixos/initrd: improve descriptions
The improved lspci command shows all available ethernet controllers and
their kernel modules. Previously, the user had to provide the slot name
of a specific device.
@@ -45,7 +45,8 @@ in
is acquired using DHCP.
You should add the module(s) required for your network card to
boot.initrd.availableKernelModules. lspci -v -s <ethernet controller>
boot.initrd.availableKernelModules.
<literal>lspci -v | grep -iA8 'network\|ethernet'</literal>

This comment has been minimized.

@teto

teto Oct 2, 2018

Contributor

I am not used to the doc but shouldn't it be <command> instead ?

This comment has been minimized.

@erikarvstedt

erikarvstedt Oct 2, 2018

Contributor

Be what? ☺️

This comment has been minimized.

@teto

teto Oct 2, 2018

Contributor

github hid the text between < > xD

This comment has been minimized.

@erikarvstedt

erikarvstedt Oct 2, 2018

Contributor

Nice catch, fixed.

This comment has been minimized.

@erikarvstedt

erikarvstedt Oct 2, 2018

Contributor

After a closer look it seems that NixOS docs and descriptions mostly use <literal> for complex shell commands:

nixpkgs=$(nix eval --raw '(builtins.fetchTarball { url = https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz; })')
grep -r '<literal>.*|' $nixpkgs
# vs
grep -r '<command>.*|' $nixpkgs

(The formatting is also nicer in the html output 🐱)
I've reverted the change.

@erikarvstedt erikarvstedt force-pushed the erikarvstedt:initrd-improvements branch 2 times, most recently to 5382491 Oct 2, 2018

@nixos-discourse

This comment has been minimized.

Copy link

nixos-discourse commented Dec 19, 2018

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review-december/1711/2

@Mic92

This comment has been minimized.

Copy link
Contributor

Mic92 commented Dec 19, 2018

@GrahamcOfBorg build nixosTests.boot.luksroot

@erikarvstedt

This comment has been minimized.

Copy link
Contributor

erikarvstedt commented Dec 19, 2018

Is there any way to get universal keyboard HID support in initrd?
Using vendor-specific drivers seems rather excessive here.

@7c6f434c

This comment has been minimized.

Copy link
Member

7c6f434c commented Dec 19, 2018

I think Cherry USB keyboards work with hid_cherry but not hid_generic, for example…

@Mic92

This comment has been minimized.

Copy link
Contributor

Mic92 commented Dec 19, 2018

In theory that should be usbhid, however some devices are not compliant to the usb keyboard device class.

@@ -221,7 +221,7 @@ in
"xhci_pci"
"usbhid"
"hid_generic" "hid_lenovo" "hid_apple" "hid_roccat"
"hid_logitech_hidpp" "hid_logitech_dj"
"hid_logitech_hidpp" "hid_logitech_dj" "hid_cherry"

This comment has been minimized.

@edolstra

edolstra Dec 19, 2018

Member

IMHO it's wrong to add a whole bunch of kernel modules to everybody's initrd. Instead nixos-generate-config should emit the required configuration in hardware-configuration.nix.

You may want to add hid_cherry to the initrd of the installation CD, though.

@erikarvstedt

This comment has been minimized.

Copy link
Contributor

erikarvstedt commented Dec 27, 2018

I've removed the extra initrdAvailableKernelModules entry and filed #52962 instead.
The remaining changes should be uncontroversial.

@matthewbauer matthewbauer merged commit 751c03e into NixOS:master Jan 7, 2019

9 checks passed

grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment