fix module loading in linuxrc

diff --git a/debian/changelog b/debian/changelog
index 1b5efe3..42364ae 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ grml-terminalserver (0.84) unstable; urgency=low
     - merge linuxrc from outside of terminalserver
     - fix error to not only use a running kernel
     - updated todo
+    - fix module loading in linuxrc
   [mika]
     - fix mkdir call of $TFTPD_DATA_DIR_/pxelinux.cfg
 

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index f94b3df..0e723f5 100755 (executable)
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -161,6 +161,7 @@ function mkInitrd
   done
   cp $USR_SHARE_/linuxrc $INITRD_/
   mkdir -p $INITRD_/mylib
+  mkdir -p $INITRD_/myusr
 
   #
   # which modules should i put into the ramdisk

diff --git a/linuxrc b/linuxrc
index 971844e..441ef54 100755 (executable)
--- a/linuxrc
+++ b/linuxrc
@@ -527,13 +527,14 @@ if [ -n "$NFS" ]; then
       if [ $? -ne 0 ]; then
          continue
       fi
-      # be quiet by default, be verbose only with bootoption debuglinuxrc
-      [ -n "$DEBUG" ] && eval "$tmp_" || eval "$tmp_" 1>/dev/null 2>/dev/null
+      echo "$tmp_" | while read i; do
+         # be quiet by default, be verbose only with bootoption debuglinuxrc
+         [ -n "$DEBUG" ] && eval "$i" || eval "$i" 1>/dev/null 2>/dev/null
+      done
     done
   }
   # 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
@@ -552,7 +553,7 @@ if [ -n "$NFS" ]; then
 
   # recreate dir layout + remove extra modules
   rdir
-  rm -rf /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