add binary timeout

diff --git a/Makefile b/Makefile
index 1af6601..78296ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ install:
        $(install_) -m 755 modcalc $(usrshare)
        $(install_) -m 755 rdir $(usrshare)
        $(install_) -m 755 cdir $(usrshare)
+       $(install_) -m 755 timeout $(usrshare)
        $(install_) -m 755 discover-nic $(usrshare)
        cp -r templates $(usrshare)
 

diff --git a/debian/changelog b/debian/changelog
index 7233781..fcc7237 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 grml-terminalserver (0.74) unstable; urgency=low
 
   * Run udhcpc for earch present interface.
+  * Added statically compiled binary timeout, taken from
+    Coroner's Toolkit (TCT), built running
+    diet gcc -static -o timeout timeout.c
 
  -- Michael Prokop <mika@grml.org>  Fri, 17 Nov 2006 19:20:43 +0100
 

diff --git a/debian/copyright b/debian/copyright
index 8b15fc2..66b9fed 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,9 @@ on Sun, 20 Mar 2005 19:39:26 +0100.
 
 Sources available at http://grml.org/repos/ and http://hg.grml.org/
 
+The timeout binary has been extracted from package tct (Forensics related utilities) version 1.11-6.3.
+The udhcpc binary has been built from package udhcp-0.9.8cvs20050303.
+
 Copyright (C) 2003++ Michael Gebetsroither <gebi@grml.org> and Michael Prokop <mika@grml.org>
 
    This package is free software; you can redistribute it and/or modify

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index d6d3867..689b4a2 100755 (executable)
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -152,7 +152,7 @@ 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_/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_/discover* $USR_SHARE_/udhcpc $USR_SHARE_/udhcp-config.sh $USR_SHARE_/cdir $USR_SHARE_/rdir /usr/bin/ldd ;do
     tmp_name_="${i##*/}"
     isNotExistent "$INITRD_/static/$tmp_name_" eprint || execute "rm $INITRD_/static/$tmp_name_"
     cp $i "$INITRD_/static/$tmp_name_"

diff --git a/linuxrc b/linuxrc
index eaa4376..5ab61ff 100755 (executable)
--- a/linuxrc
+++ b/linuxrc
@@ -551,7 +551,7 @@ if [ -n "$NFS" ]; then
 
   for INTERFACE in `ifconfig -a | grep '^eth' | sed 's/\ .*//'` ; do
       log_begin_msg "Requesting network configuration using udhcp for ${INTERFACE}:" ; echo
-      /static/udhcpc --interface="${INTERFACE}" --foreground --quit --script=/static/udhcp-config.sh
+      /static/timeout 10 /static/udhcpc --interface="${INTERFACE}" --foreground --quit --script=/static/udhcp-config.sh
       # echo "press <enter> to start a system shell and configure your system"
       # sh
   done