From 0ef7f590a72b13780494d8450f299f53463e62b3 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 21 Dec 2006 23:32:55 +0000
Subject: Fix for busybox nfs mount (uses UDP in default, so TCP has to be
 given as explicit option), fix for dhcp request if no ip= is given in kernel
 commandline (set interface to UP).

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@578 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/etc/functions | 6 ++++--
 initramfs/initrd-stuff/init          | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 24685df1..083e6951 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -326,7 +326,8 @@ local ret=0
   loadmod /lib/modules/@@@KERNVER@@@/kernel/fs/nfs/nfs.ko "$error_modnfs"
 # busybox mount has to be compiled with nfs mount support otherwise
 # --> error "$error_mntt"
-mount -n -t nfs -o ro,nolock $nfsroot $dest || ret=1
+mount -n -t nfs -o ro,nolock,tcp $nfsroot $dest || \
+  mount -n -t nfs -o ro,nolock,udp $nfsroot $dest || ret=1
 return $ret
 }
 #############################################################################
@@ -371,7 +372,8 @@ if [ "$dhcp" = "none" ] ; then
 else
   # ensure the interface is up - might produce conflicts - nbd could
   # fail!!
-  # ipsetup 0.0.0.0 255.255.255.255 0.0.0.0 255.255.255.255 eth0 &
+  [ -n "$noipyet" ] && \
+    ipsetup 0.0.0.0 255.255.255.255 0.0.0.0 255.255.255.255 eth0
   [ -f /lib/modules/@@@KERNVER@@@/kernel/net/packet/af_packet.ko ] && \
     loadmod /lib/modules/@@@KERNVER@@@/kernel/net/packet/af_packet.ko \
       "needed for dhcp";
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index 13ea98ae..390022ac 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -573,7 +573,7 @@ mount -n --move /dev /mnt/dev
 chmod a+rwxt /mnt/dev/shm
 killall -9 udevd 2>/dev/null
 # kill the watchdog (errhalt)
-[ -f /tmp/watchdog ] && kill $(cat /tmp/watchdogpid) 2>/dev/null
+[ -f /tmp/watchdog ] && kill -9 $(cat /tmp/watchdogpid) #2>/dev/null
 # runtimer
 [ $DEBUGLEVEL -eq 8 ] && echo "** SLX init ended near $(sysup)"
 umount -n /proc
-- 
cgit v1.2.3-55-g7522