From 1cbb2ddde2cb09e2735ab372551945d17c3187b8 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Fri, 15 Dec 2006 22:29:56 +0000
Subject: Busybox had broken killall - fixed. Fixed replacement bug for udhcpc
 script, nameserver in resolv.conf is set properly now.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@549 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/bin/dhcpmkconfig |   5 ++---
 initramfs/initrd-stuff/init             |   2 +-
 initramfs/mkdxsinitrd                   |   8 ++++++++
 tools/busybox                           | Bin 321888 -> 321920 bytes
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/initramfs/initrd-stuff/bin/dhcpmkconfig b/initramfs/initrd-stuff/bin/dhcpmkconfig
index d32bd8e6..86fd42c7 100755
--- a/initramfs/initrd-stuff/bin/dhcpmkconfig
+++ b/initramfs/initrd-stuff/bin/dhcpmkconfig
@@ -4,7 +4,7 @@
 # clients used within OpenSLX initramfs. The result is written in unified
 # form to the /etc/machine-setup file
 #
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 14-11-2006
+# Dirk von Suchodoletz <dvs@OpenSLX.com>, 15-12-2006
 # Lars Mueller, 23-06-2006
 # Oliver Tappe, 23-06-2006
 #
@@ -61,9 +61,8 @@ enabled via kernel command\n# line)." >>$cfgfile
       -e "s,^P.*,,;s,ntpsrv,ntp_servers,;s,ip,clientip," \
       -e "s,serverid,serverip,;s,subnet,subnet_mask," \
       -e "s,router,gateway,;s,hostname,host_name," \
-      -e "s,dns,domain_name_servers,;s,domain,domain_name," \
+      -e "s,domain,domain_name,;s,dns,domain_name_servers," \
       -e "s,broadcast,broadcast_address,;s,dhc.*,,;/^$/d" \
         >>/tmp/confviadhcp
   ;;
 esac
-
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index 86208016..fec140c7 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -567,7 +567,7 @@ umount -n /sys || error "$init_errsys" nonfatal
 umount -n /proc/bus/usb >/dev/null 2>&1
 mount -n --move /dev /mnt/dev
 chmod a+rwxt /mnt/dev/shm
-killall -9 udevd 2>/dev/null
+killall -9 udevd sleep usleep 2>/dev/null
 [ $DEBUGLEVEL -eq 8 ] && echo "** SLX init ended near $(sysup)"
 umount -n /proc
 # unset old environment variables
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd
index 245e9fb8..df3a5eec 100755
--- a/initramfs/mkdxsinitrd
+++ b/initramfs/mkdxsinitrd
@@ -513,6 +513,14 @@ if [ -n "$use_busybox" ] ; then
   # fake the sh link in busybox environment
   echo -e "#!/bin/ash\n/bin/ash \$@" > ${INSTDIR}/bin/sh
   chmod a+x ${INSTDIR}/bin/sh
+  # binaries useful for debugging purposes
+  if [ $IRFSDEBUG -gt 2 ] ; then
+    for bbins in \
+      strace
+    do
+      cobi ${bbins} bin || echo "Program ${bbins} not found"
+    done
+  fi
 else
   # find and copy a shell to be used within initialramfs
   for bbins in bash ash sh; do
diff --git a/tools/busybox b/tools/busybox
index 911e7ee7..bad90239 100755
Binary files a/tools/busybox and b/tools/busybox differ
-- 
cgit v1.2.3-55-g7522