ash_functions: move sleep 2 after all usb modules being loaded so tha…

…t USB Security dongles are sure to be detected prior of "Verifying presence of GPG card" Otherwise we get ehci-pci and xhci_hcd kernel messages pop in dmesg on debug AFTER "Verifying presence of GPG card" which explains why dongle might not be found in time and fails in oem-factory-reset Might be linked to Nitrokey#48 Signed-off-by: Thierry Laurion <[email protected]>
tlaurion · Apr 12, 2024 · 0aa6126 · 0aa6126
1 parent ba685e2
commit 0aa6126
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/initrd/etc/ash_functions b/initrd/etc/ash_functions
@@ -324,11 +324,11 @@ enable_usb()
 		insmod /lib/modules/uhci-hcd.ko || die "uhci_hcd: module load failed"
 		insmod /lib/modules/ohci-hcd.ko || die "ohci_hcd: module load failed"
 		insmod /lib/modules/ohci-pci.ko || die "ohci_pci: module load failed"
-		sleep 2
 	fi
 	insmod /lib/modules/ehci-pci.ko || die "ehci_pci: module load failed"
 	insmod /lib/modules/xhci-hcd.ko || die "xhci_hcd: module load failed"
 	insmod /lib/modules/xhci-pci.ko || die "xhci_pci: module load failed"
+	sleep 2
 
 	# For resiliency, test CONFIG_USB_KEYBOARD_REQUIRED explicitly rather
 	# than having it imply CONFIG_USER_USB_KEYBOARD at build time.