wok-tiny rev 103
Load suggested modules
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Jan 06 13:13:00 2016 +0100 (2016-01-06) |
parents | 7cd5e798bfe2 |
children | 2cc2f08d75b7 |
files | base-tiny/stuff/etc/init.d/rcS dropbear/receipt hardware-ibm-6272/receipt module-cs89x0/receipt module-serial/receipt |
line diff
1.1 --- a/base-tiny/stuff/etc/init.d/rcS Tue Jan 05 14:44:30 2016 +0100 1.2 +++ b/base-tiny/stuff/etc/init.d/rcS Wed Jan 06 13:13:00 2016 +0100 1.3 @@ -32,15 +32,15 @@ 1.4 fi 1.5 1.6 # Load all modules listed in config file. 1.7 -if [ "$LOAD_MODULES" ]; then 1.8 +if [ "$LOAD_MODULES" -o -s /modules ]; then 1.9 echo -n "Loading modules..." 1.10 - for mod in $LOAD_MODULES 1.11 + for mod in $LOAD_MODULES $(cat /modules 2> /dev/null) 1.12 do 1.13 echo -n " ${mod%%|*}" 1.14 modprobe ${mod//|/ } 1.15 done 1.16 status 1.17 - [ "$KEEP_MODULES" ] || rm -rf /lib/modules 1.18 + [ "$KEEP_MODULES" ] || rm -rf /lib/modules /modules 2> /dev/null 1.19 fi 1.20 1.21 # Mount /sys.
2.1 --- a/dropbear/receipt Tue Jan 05 14:44:30 2016 +0100 2.2 +++ b/dropbear/receipt Wed Jan 06 13:13:00 2016 +0100 2.3 @@ -37,7 +37,7 @@ 2.4 chgrp 0 $DESTDIR/usr/sbin/dropbear && 2.5 install -d -m 755 $DESTDIR/usr/bin && 2.6 for i in $DROPBEARS ssh; do 2.7 - ln -s ../sbin/dropbear $DESTDIR/usr/bin/$i 2.8 + ln $DESTDIR/usr/sbin/dropbear $DESTDIR/usr/bin/$i 2.9 done 2.10 } 2.11
3.1 --- a/hardware-ibm-6272/receipt Tue Jan 05 14:44:30 2016 +0100 3.2 +++ b/hardware-ibm-6272/receipt Wed Jan 06 13:13:00 2016 +0100 3.3 @@ -32,11 +32,12 @@ 3.4 else if (/ACT Y/) { s=0; print \\"(ACT Y)\\"} \\ 3.5 else print \\ 3.6 }" > /etc/isapnp.conf 3.7 -if isapnp /etc/isapnp.conf > /dev/null 2>&1 ; then 3.8 - modprobe cs89x0 io=0x\$io irq=\$irq > /dev/null 2>&1 3.9 +grep CSC6040 /etc/isapnp.conf || break 2 3.10 +if isapnp /etc/isapnp.conf ; then 3.11 + modprobe cs89x0 io=0x\$io irq=\$irq 3.12 break 2 3.13 fi 3.14 -done ; done 3.15 +done ; done > /dev/null 2>&1 3.16 status 3.17 EOT 3.18 grep pnp.sh $1/etc/rcS.conf || 3.19 @@ -44,10 +45,10 @@ 3.20 list="" 3.21 for i in $IRQ_CS89X0_LIST ; do 3.22 case " 15 12 11 10 9 7 6 5 4 3 " in 3.23 - *\ $i\ *) list="$list $i " 3.24 + *\ $i\ *) list="$list $i" 3.25 esac 3.26 done 3.27 - sed -i "s/IRQ_CS89X0_LIST/${list:-15 12 11 10}/" $1/etc/init.d/pnp.sh 3.28 + sed -i "s/ IRQ_CS89X0_LIST/${list:-15 12 11 10}/" $1/etc/init.d/pnp.sh 3.29 sed -i 's/cs89x0[^ "]* //' $1/etc/rcS.conf 3.30 sed -i '/rm -f .sbin.*pnp/d' $1/etc/init.d/pnp.sh 3.31 [ "$CS89X0_WIPEPNP" == "on" ] &&
4.1 --- a/module-cs89x0/receipt Tue Jan 05 14:44:30 2016 +0100 4.2 +++ b/module-cs89x0/receipt Wed Jan 06 13:13:00 2016 +0100 4.3 @@ -27,7 +27,8 @@ 4.4 # Post install/remove commands for Tazpkg. 4.5 post_install() 4.6 { 4.7 - [ "$IRQCS89" ] && IRQCS89="|irq=${IRQCS89%%[, ]*}" 4.8 + [ "$IRQCS89" ] || return 4.9 + IRQCS89="|irq=${IRQCS89%%[, ]*}" 4.10 [ "$IOCS89" ] && IOCS89="|io=${IOCS89%%[, ]*}" 4.11 echo "${PACKAGE#*-}$IOCS89$IRQCS89|mode=${MODECS89:-rj45}|debug=${DEBUGCS89:-0}" >> $1/modules 4.12 }