bootable/newinstaller
| Révision | 10a68efaf5265887fe76a07fa655722cd6bf9c0d (tree) |
|---|---|
| l'heure | 2015-10-23 17:32:15 |
| Auteur | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
init: avoid using init modprobe
The init modprobe should not be used before the porting is finished,
otherwise the system suddenly reboots.
Also remove the obsolete way to load modules.
initrd/init (diff) initrd/scripts/0-auto-detect (diff)| @@ -3,7 +3,7 @@ | ||
| 3 | 3 | # By Chih-Wei Huang <cwhuang@linux.org.tw> |
| 4 | 4 | # and Thorsten Glaser <tg@mirbsd.org> |
| 5 | 5 | # |
| 6 | -# Last updated 2015/10/05 | |
| 6 | +# Last updated 2015/10/23 | |
| 7 | 7 | # |
| 8 | 8 | # License: GNU Public License |
| 9 | 9 | # We explicitely grant the right to use the scripts |
| @@ -169,7 +169,7 @@ if [ -x system/bin/ln -a \( -n "$DEBUG" -o -n "$BUSYBOX" \) ]; then | ||
| 169 | 169 | fi |
| 170 | 170 | |
| 171 | 171 | # ensure keyboard driver is loaded |
| 172 | -[ -n "$INSTALL" -o -n "$DEBUG" ] && modprobe atkbd | |
| 172 | +[ -n "$INSTALL" -o -n "$DEBUG" ] && busybox modprobe atkbd | |
| 173 | 173 | |
| 174 | 174 | if [ 0$DEBUG -gt 0 ]; then |
| 175 | 175 | echo -e "\nType 'exit' to continue booting...\n" |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | # |
| 2 | 2 | # By Chih-Wei Huang <cwhuang@linux.org.tw> |
| 3 | -# Last updated 2015/10/20 | |
| 3 | +# Last updated 2015/10/23 | |
| 4 | 4 | # |
| 5 | 5 | # License: GNU Public License |
| 6 | 6 | # We explicitely grant the right to use the scripts |
| @@ -13,7 +13,7 @@ auto_detect() | ||
| 13 | 13 | tmp=/tmp/dev2mod |
| 14 | 14 | echo 'dev2mod() { while read dev; do case $dev in' > $tmp |
| 15 | 15 | sort -r /lib/modules/`uname -r`/modules.alias | \ |
| 16 | - sed -n 's/^alias *\([^ ]*\) *\(.*\)/\1)modprobe \2;;/p' >> $tmp | |
| 16 | + sed -n 's/^alias *\([^ ]*\) *\(.*\)/\1)busybox modprobe \2;;/p' >> $tmp | |
| 17 | 17 | echo 'esac; done; }' >> $tmp |
| 18 | 18 | source $tmp |
| 19 | 19 | cat /sys/bus/*/devices/*/modalias | dev2mod |
| @@ -41,19 +41,12 @@ find_network_dev_name() | ||
| 41 | 41 | |
| 42 | 42 | load_modules() |
| 43 | 43 | { |
| 44 | - if [ -n "$FOUND" ]; then | |
| 45 | - [ -n "$PREDEV" ] && modprobe $PREDEV | |
| 46 | - [ -n "$FB0DEV" -a -z "$UVESA_MODE" ] && modprobe $FB0DEV | |
| 47 | - [ -n "$LANDEV" ] && modprobe $LANDEV | |
| 48 | - [ -n "$WIFDEV" ] && modprobe $WIFDEV | |
| 49 | - [ -n "$SNDDEV" ] && modprobe $SNDDEV | |
| 50 | - [ -n "$CAMDEV" ] && modprobe $CAMDEV | |
| 51 | - else | |
| 44 | + if [ -z "$FOUND" ]; then | |
| 52 | 45 | auto_detect |
| 53 | 46 | fi |
| 54 | 47 | |
| 55 | 48 | # 3G modules |
| 56 | 49 | for m in $EXTMOD; do |
| 57 | - modprobe $m | |
| 50 | + busybox modprobe $m | |
| 58 | 51 | done |
| 59 | 52 | } |
Fork