X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver-config;h=770b95ebbcf3171d1784e890052a5b4c2615e83d;hb=d08e1efc7f144277b6efd13d3fb58d0b62d55d75;hp=b8b84bcdc41ea795f1e1856e611cc07f897a8f2a;hpb=68d8f1b0bfb6efb9ff8b24c6ec4d3773f36a1af0;p=grml-terminalserver.git

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index b8b84bc..770b95e 100755
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -154,40 +154,24 @@ function mkInitrd
   # implanting my initrd changes into the original initrd
 
   # copy programs, check if there are already links with this name to busybox
-  for i in $USR_SHARE_/timeout $USR_SHARE_/discover* $USR_SHARE_/udhcpc $USR_SHARE_/udhcp-config.sh $USR_SHARE_/cdir $USR_SHARE_/rdir /usr/bin/ldd ;do
+  for i in $USR_SHARE_/timeout $USR_SHARE_/udhcp-config.sh $USR_SHARE_/cdir $USR_SHARE_/rdir; do
     tmp_name_="${i##*/}"
     isNotExistent "$INITRD_/static/$tmp_name_" eprint || execute "rm $INITRD_/static/$tmp_name_"
     cp $i "$INITRD_/static/$tmp_name_"
   done
   cp $USR_SHARE_/linuxrc $INITRD_/
   mkdir -p $INITRD_/mylib
-  mkdir -p $INITRD_/myusr/i386-uclibc-linux/lib
-  for i in libdl libc libuClibc ld-uClibc; do
-    cp -a $UCLIBC_PATH_/$i*.so* $INITRD_/myusr/i386-uclibc-linux/lib
-  done
-
-  # copy data files for discover (discover-data)
-  mkdir -p $INITRD_/mylib/discover
-  cp /lib/discover/list.xml /lib/discover/pci-*.xml $INITRD_/mylib/discover/
+  mkdir -p $INITRD_/myusr
 
   #
   # which modules should i put into the ramdisk
   #
 
-  # get cards detected by discover
-  if [ -f /lib/discover/pci.lst ] ; then
-    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 *all* network drivers, but do not include wlan/pcmcia/... related ones
-    # blacklist: proteon and depca as they seem to cause problems with udevsettle
-    find /lib/modules/`uname -r`/kernel/drivers/net/ -name \*.ko | grep -v 'wireless\|wan\|hamradio\|wlan\|ppp\|irda\|pcmcia\|depca\|proteon' | \
-         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/${KERNEL_VERSION_}/kernel/drivers/net -name ${mod}.ko | sed 's#.*./## ; s#\.ko##' >> $CARDS_DETECTED_BY_DISCOVER
-    # done
-  fi
+  # find *all* network drivers, but do not include wlan/pcmcia/... related ones
+  # blacklist: proteon and depca as they seem to cause problems with udevsettle
+  find ${MODULES_PATH_}/${KERNEL_VERSION_}/kernel/drivers/net/ -name \*.ko | \
+    grep -v 'wireless\|wan\|hamradio\|wlan\|ppp\|irda\|pcmcia\|depca\|proteon' | \
+      sed 's#.*./## ; s#\.ko##' | sort | uniq > $CARDS_DETECTED_BY_DISCOVER
 
   local modules="`cat $CARDS_DETECTED_BY_DISCOVER |xargs` af_packet"
   local modules_dep=""
@@ -226,16 +210,18 @@ function mkInitrd
     cp $MODULES_PATH_/$KERNEL_VERSION_/kernel/$i "$tmp_path"
   done
 
-  # generate modules.dep
+  # copying modules.*
   cp $MODULES_PATH_/$KERNEL_VERSION_/modules.dep $mod_path_
+  cp $MODULES_PATH_/$KERNEL_VERSION_/modules.alias $mod_path_
   #grep "^\/lib\/modules\/$KERNEL_VERSION_\/kernel\/" $MODULES_PATH_/$KERNEL_VERSION_/modules.dep |\
   #  sed "s/\/lib\/modules\/$KERNEL_VERSION_\/kernel\//\/modules\//g" > $mod_path_/modules.dep
 
   # put everything into the new initrd
   local tmp_size=`du -s $INITRD_ |awk '{print $1}'`   # in kB
   let tmp_size=$tmp_size+1000
-  if (( $tmp_size >= 16000 )); then
-    warn "Your initrd is $tmp_size kByte large => TOO BIG (should be <= 16000kB)"
+  local max_size=24000
+  if (( $tmp_size >= $max_size )); then
+    warn "Your initrd is $tmp_size kByte large => TOO BIG (should be <= ${max_size}kB)"
     warn "Please remove a few modules from $CARDS_DETECTED_BY_DISCOVER or edit $INITRD_ manually"
     return 1
   fi
@@ -326,7 +312,7 @@ for addresses from 192.168.0.101 to (and including) 192.168.0.200.
   NAMESERVERS_=`netGetNameservers warn`
   GW_=`netGetDefaultGateway warn`
   GW_DEV_=`/sbin/ip route get "$GW_" | awk '{ print $3; exit; }'`
-  if [ "$GW_DEV_" != "$INTERFACE_" ]; then
+  if [ "$GW_DEV_" != "$INTERFACE_" ] && [ "$GW_DEV_" != "" ]; then
     # GW_DEV_ of server is not the same device as the one serviced by dhcpd
     # so it doesn't make sense to provide the GW_ address to the clients
     local do_nat_="YES"
@@ -345,13 +331,9 @@ the internet?"
       NAT_INTERFACE_="$GW_DEV_"
     else
       # no NAT, no sensible gateway
-      GW_=
-      NAT_INTERFACE_="none"
+      GW_=""
+      NAT_INTERFACE_=""
     fi
-  else
-    # no NAT, no sensible gateway
-    GW_=
-    NAT_INTERFACE_="none"
   fi