Android-x86
Fork
Faire un don

  • R/O
  • HTTP
  • SSH
  • HTTPS

bootable-newinstaller: Commit

bootable/newinstaller


Commit MetaInfo

Révision8c73ac1a261c708eef7817c625a041cf1b3ca427 (tree)
l'heure2017-01-10 12:59:23
AuteurChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Message de Log

initrd: load drivers in debug or installation modes

On some machines the input devices may not be activated because
their drivers are not loaded yet in debug or installation modes.

The change tries to fix it by calling the auto_detect function.
Skip the display (kms) modules to avoid some potential issues.

Change Summary

Modification

--- a/initrd/init
+++ b/initrd/init
@@ -3,7 +3,7 @@
33 # By Chih-Wei Huang <cwhuang@linux.org.tw>
44 # and Thorsten Glaser <tg@mirbsd.org>
55 #
6-# Last updated 2017/01/09
6+# Last updated 2017/01/10
77 #
88 # License: GNU Public License
99 # We explicitely grant the right to use the scripts
@@ -169,19 +169,19 @@ if [ -x system/bin/ln -a \( -n "$DEBUG" -o -n "$BUSYBOX" \) ]; then
169169 hash -r
170170 fi
171171
172+# load scripts
173+for s in `ls /scripts/* /src/scripts/*`; do
174+ test -e "$s" && source $s
175+done
176+
172177 # ensure keyboard driver is loaded
173-[ -n "$INSTALL" -o -n "$DEBUG" ] && busybox modprobe -a atkbd hid-apple
178+[ -n "$INSTALL" -o -n "$DEBUG" ] && auto_detect &
174179
175180 if [ 0$DEBUG -gt 0 ]; then
176181 echo -e "\nType 'exit' to continue booting...\n"
177182 debug_shell debug-found
178183 fi
179184
180-# load scripts
181-for s in `ls /scripts/* /src/scripts/*`; do
182- test -e "$s" && source $s
183-done
184-
185185 # A target should provide its detect_hardware function.
186186 # On success, return 0 with the following values set.
187187 # return 1 if it wants to use auto_detect
--- a/initrd/scripts/0-auto-detect
+++ b/initrd/scripts/0-auto-detect
@@ -15,7 +15,9 @@ auto_detect()
1515 sort -r /lib/modules/`uname -r`/modules.alias | \
1616 sed -n 's/^alias *\([^ ]*\) *\(.*\)/\1)busybox modprobe \2;;/p' >> $tmp
1717 echo 'esac; done; }' >> $tmp
18- sed -i '/brcmfmac/d' $tmp
18+ for f in $(grep drm_kms /lib/modules/`uname -r`/modules.dep | cut -d. -f1); do
19+ sed -i "/$(basename $f | sed 's/-/_/g')/d" $tmp
20+ done
1921 source $tmp
2022 cat /sys/bus/*/devices/*/uevent | grep MODALIAS | sed 's/^MODALIAS=//' | awk '!seen[$0]++' | dev2mod
2123 cat /sys/devices/virtual/wmi/*/modalias | dev2mod
Afficher sur ancien navigateur de dépôt.