Skip to content

fix USB keyboard initialization #2102

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.

Sign up for GitHub

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

Merged
tlaurion merged 1 commit into from
May 7, 2026
+6 −6
Merged

fix USB keyboard initialization #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions initrd/etc/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,12 +1151,12 @@ enable_usb_keyboard() {
# For resiliency, test CONFIG_USB_KEYBOARD_REQUIRED explicitly rather
# than having it imply CONFIG_USER_USB_KEYBOARD at build time.
# Otherwise, if a user got CONFIG_USER_USB_KEYBOARD=n in their
# config.user by mistake (say, by copying config.user from a laptop to a
# desktop/server), they could lock themselves out, only recoverable by
# hardware flash.
# config.user by mistake, they could lock themselves out.
if [ "$CONFIG_USB_KEYBOARD_REQUIRED" = y ] || [ "$CONFIG_USER_USB_KEYBOARD" = y ]; then
insmod.sh /lib/modules/usbhid.ko || DIE "usbhid: module load failed"
fi
enable_usb
wait_for_usb_devices
insmod.sh /lib/modules/usbhid.ko || DIE "usbhid: module load failed"
fi
}

# ------- End of functions coming from /etc/ash_functions
Expand Down
2 changes: 1 addition & 1 deletion initrd/init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ fi

# load USB modules for boards using a USB keyboard
if [ "$CONFIG_USB_KEYBOARD_REQUIRED" = y ] || [ "$CONFIG_USER_USB_KEYBOARD" = "y" ]; then
enable_usb
enable_usb_keyboard
fi

# Set the keyboard keymap if defined, file exists, and loadkeys is available
Expand Down