X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=linuxrc;h=d2e689978cfeac4486e7713191a91cf114f17f1e;hb=58888c7de07621d6f7b2e4fcdc176ce969265d66;hp=611b8c243c26c4166b4f8ad10634c2b308bbd287;hpb=5b253a4b4ff3d2ac9d66a9b83ce4ee033d3cb47a;p=grml-terminalserver.git

diff --git a/linuxrc b/linuxrc
index 611b8c2..d2e6899 100755
--- a/linuxrc
+++ b/linuxrc
@@ -508,11 +508,9 @@ esac
 
 stage=2
 rundebugshell
-echo "before NFS"
+# NFS
 for i in $cmdline; do case "$i" in nfsdir=*|NFSDIR=*) eval $i;; esac; done
 [ -n "$nfsdir" ] && NFS="$nfsdir"
-echo "nfsdir=$NFS"
-# NFS
 if [ -n "$NFS" ]; then
   tmp_="$(getbootparam nfsdir)"
   echo -n "checkbootparam nfsdir   "
@@ -522,25 +520,32 @@ if [ -n "$NFS" ]; then
   # put the mylibs into /lib for discover and udhcpc
   cdir
 
-  # starting hw-detection for network card
-  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\""
+  # 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 | tr -d \.ko` >> /modules.load
+  done
+  modules_to_load=`cat /modules.load | xargs`
 
   # FIXME modprobe is buggy from busybox
-  modules_to_load=`echo $modules_to_load | xargs`
   modLoad()
   {
     for mod in $@ ; do
-      tmp_="`modprobe -vn $mod`"
+      tmp_="`modprobe -vn $mod 2>/dev/null`"
       if [ $? -ne 0 ]; then
-        continue
+         continue
       fi
-      eval "$tmp_"
+      # be quiet by default, be verbose only with bootoption debuglinuxrc
+      [ -n "$DEBUG" ] && eval "$tmp_" || eval "$tmp_" 1>/dev/null 2>/dev/null
     done
   }
   modLoad "$modules_to_load"
+  rm -f /modules.load
 
   # loading additional modules
   modLoad sunrpc lockd af_packet nfs
@@ -554,19 +559,17 @@ if [ -n "$NFS" ]; then
   #rm -rf /myusr /mylib
 
   log_begin_msg "${RED}Debug: NFS = ${NFS}${NORMAL}"
-  log_begin_msg -n "${CRE}${BLUE}Looking for GRML in: ${MAGENTA}$NFS${NORMAL}   "
+  log_begin_msg -n "${CRE}${NORMAL}Looking for GRML in: ${MAGENTA}$NFS${NORMAL}"
   if mount -t nfs "$NFS" -o "async,ro,nolock" /cdrom #>/dev/null 2>&1
     then
     if test -f /cdrom/$GRML_DIR/$GRML_NAME
       then
-      log_begin_msg -n "${CRE} ${GREEN}Accessing grml CDROM at ${MAGENTA}$NFS${GREEN}...${NORMAL}"
+      log_begin_msg -n "Accessing grml CDROM at ${MAGENTA}$NFS${NORMAL}" ; echo "  $SUCCESS"
       FOUND_GRML="$NFS"
       break
     fi
   fi
 fi
-echo "after NFS"
-
 
 # Now that the right SCSI driver is (hopefully) loaded, try to find CD-ROM
 if test -z $NFS ; then