X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=linuxrc;h=971844ef80823dd4a36bc8da755585542cf6edfc;hb=744835b3f429c89983adc3d83c27f5a1baebb7fe;hp=7d8bba1d2eebd36dfe74b4128b04fb88377b4f97;hpb=4188334089974d84806300e35a885b65c4dfcb08;p=grml-terminalserver.git

diff --git a/linuxrc b/linuxrc
index 7d8bba1..971844e 100755
--- a/linuxrc
+++ b/linuxrc
@@ -516,21 +516,8 @@ if [ -n "$NFS" ]; then
   tmp_="$(getbootparam nfsdir)"
   log_begin_msg "Bootoption NFS found." ; echo "$SUCCESS"
 
-  # put the mylibs into /lib for discover and udhcpc
   cdir
 
-  # starting hw-detection for network card - currently broken, so don't use it
-  #  echo "Starting hw-detection"
-  #  kernel_version_=`uname -r`
-  #  modules_to_load=$(/static/discover --disable-bus all --enable-bus pci --type network --normalize-whitespace --data-path=linux/module/name --data-version=$kernel_version_ | grep -v '^ $' | uniq)
-  #  echo "trying to load the following network modules:  \"$modules_to_load\""
-
-  KERNELVER=`uname -r`
-  for mod in `find /lib/modules/$KERNELVER/kernel/drivers/net/ -name \*.ko` ; do
-      echo `basename $mod | sed -e 's/\.ko$//'` >> /modules.load
-  done
-  modules_to_load=`cat /modules.load | xargs`
-
   # FIXME modprobe is buggy from busybox
   log_begin_msg "Trying to load network driver(s)." ; echo
   modLoad()
@@ -544,8 +531,9 @@ if [ -n "$NFS" ]; then
       [ -n "$DEBUG" ] && eval "$tmp_" || eval "$tmp_" 1>/dev/null 2>/dev/null
     done
   }
-  modLoad "$modules_to_load"
-  rm -f /modules.load
+  # modules.alias and modules.dep are in place so USE IT :)!
+  modLoad "$(for x in $(find /sys/devices/ -name modalias); do grep pci: $x; done |xargs)"
+  modLoad "$NIC_PROBE"
 
   # loading additional modules
   modLoad sunrpc lockd af_packet nfs
@@ -562,9 +550,9 @@ if [ -n "$NFS" ]; then
       # sh
   done
 
-  # recreate the old dir structures
+  # recreate dir layout + remove extra modules
   rdir
-  #rm -rf /myusr /mylib
+  rm -rf /mylib
 
   log_begin_msg "Looking for GRML in: ${MAGENTA}$NFS${NORMAL}" ; echo "$SUCCESS"
   if mount -t nfs "$NFS" -o "async,ro,nolock" /cdrom #>/dev/null 2>&1