* add statically compiled udhcpc build using udhcp-0.9.8cvs20050303

  with "LDFLAGS='-static' make".
* reworked search for network modules

diff --git a/debian/changelog b/debian/changelog
index b0f4ffb..2eca203 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ grml-terminalserver (0.72) unstable; urgency=low
   * update linuxrc
   * try to fix the "discover" bugs
   * reject tcp/113 via iptables to speed up PXE boot
+  * add statically compiled udhcpc build using udhcp-0.9.8cvs20050303
+    with "LDFLAGS='-static' make".
 
  -- Michael Prokop <mika@grml.org>  Thu, 16 Nov 2006 14:46:48 +0100
 

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index eb3830b..13bdaeb 100755 (executable)
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -177,7 +177,12 @@ function mkInitrd
     isNotExistent $CARDS_DETECTED_BY_DISCOVER && awk '/ethernet/{print $3}' /lib/discover/pci.lst |sort |uniq > $CARDS_DETECTED_BY_DISCOVER
   else # newer discover does not provide /lib/discover/pci.lst, get a list of all network drivers therefore
     isNotExistent $CARDS_DETECTED_BY_DISCOVER && \
-    find /lib/modules/`uname -r`/kernel/drivers/net/ -name \*.ko | sed 's#.*./## ; s#\.ko##' | sort | uniq > $CARDS_DETECTED_BY_DISCOVER
+    # find *all* network drivers
+    # find /lib/modules/`uname -r`/kernel/drivers/net/ -name \*.ko | sed 's#.*./## ; s#\.ko##' | sort | uniq > $CARDS_DETECTED_BY_DISCOVER
+    # find the ones supported by discover
+    for mod in `grep "name'>.*</data>" /lib/discover/pci-device.xml | sed "s#.*name'>## ; s#</data>##" | sort -u`; do
+        find /lib/modules/2.6.18-grml/kernel/drivers/net -name ${mod}.ko | sed 's#.*./## ; s#\.ko##' >> $CARDS_DETECTED_BY_DISCOVER
+    done
   fi
 
   local modules="`cat $CARDS_DETECTED_BY_DISCOVER |xargs` af_packet"

diff --git a/udhcpc b/udhcpc
index 9485767..fb25939 100755 (executable)
Binary files a/udhcpc and b/udhcpc differ