Menu
▾
▴
[Devil-linux-commit] build/scripts/scripts setup,1.32,1.33
|
From: Heiko Z. <smi...@us...> - 2009-12-13 20:52:55
|
Update of /cvsroot/devil-linux/build/scripts/scripts In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27501/scripts/scripts Modified Files: setup Log Message: - closed bug #30 - In Setup: can't select 'none' or 'default' for network adapter type setup and network init script now support the module 'autoselect', which is whatever the kernel decides to load for the nic Index: setup =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/scripts/setup,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- setup 10 Mar 2009 22:35:12 -0000 1.32 +++ setup 13 Dec 2009 20:52:45 -0000 1.33 @@ -426,7 +426,7 @@ if [ ! -f $NIC ]; then echo "DEVICE=$1" > $NIC echo "ONBOOT=yes" >> $NIC - echo "MODULE=UNKNOWN" >> $NIC + echo "MODULE=autoselect" >> $NIC if [ "$1" = "eth0" ]; then echo "DHCP=yes" >> $NIC echo "IP=" >> $NIC @@ -473,9 +473,8 @@ if [ $RETURN -eq 0 ]; then case "$NICMENU" in MODULE) - rm -f $TMP echo -en "\n\nLocating all network modules, please wait ..." - for i in $(find /lib/modules/$(uname -r)/net /lib/modules/$(uname -r)/kernel/drivers/net /lib/modules/$(uname -r)/misc/vmxnet.ko -type f -printf "%f\n"|grep -v -e mii.ko -e aironet4500_core.ko -e aironet4500_proc.ko -e arlan-proc.ko -e bonding.ko -e bsd_comp.ko -e dummy.ko -e eql.ko -e ethertap.ko -e plip.ko -e ppp -e slhc.ko -e slip.ko -e strip.ko|sed 's/\.ko$//'|sort|uniq) + for i in $(echo autoselect; find /lib/modules/$(uname -r)/net /lib/modules/$(uname -r)/kernel/drivers/net /lib/modules/$(uname -r)/misc/vmxnet.ko -type f -printf "%f\n" 2> /dev/null |grep -v -e mii.ko -e aironet4500_core.ko -e aironet4500_proc.ko -e arlan-proc.ko -e bonding.ko -e bsd_comp.ko -e dummy.ko -e eql.ko -e ethertap.ko -e plip.ko -e ppp -e slhc.ko -e slip.ko -e strip.ko|sed 's/\.ko$//'|sort|uniq) do SEL="off" [ $i = "$MOD" ] && SEL="on" |
