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

Minor initrd improvements #47665

Merged
merged 1 commit into from Jan 7, 2019

Conversation

erikarvstedt
Copy link
Member

No description provided.

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>
Copy link
Member

@teto teto Oct 2, 2018

Choose a reason for hiding this comment

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

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

Copy link
Member Author

Choose a reason for hiding this comment

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

Be what? ☺️

Copy link
Member

Choose a reason for hiding this comment

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

github hid the text between < > xD

Copy link
Member Author

Choose a reason for hiding this comment

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

Nice catch, fixed.

Copy link
Member Author

Choose a reason for hiding this comment

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

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 initrd-improvements branch 2 times, most recently from f8ded00 to 5382491 Compare October 2, 2018 17:03
@nixos-discourse
Copy link

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
Copy link
Member

Mic92 commented Dec 19, 2018

@GrahamcOfBorg build nixosTests.boot.luksroot

@erikarvstedt
Copy link
Member Author

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

@7c6f434c
Copy link
Member

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

@Mic92
Copy link
Member

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"
Copy link
Member

Choose a reason for hiding this comment

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

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
Copy link
Member Author

erikarvstedt commented Dec 27, 2018

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

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/usb-keyboard-not-recognized-during-boot/14711/3

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.

None yet

8 participants