summaryrefslogtreecommitdiffstats
path: root/initramfs/initrd-stuff/etc/functions
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-12-22 00:32:55 +0100
committerDirk von Suchodoletz2006-12-22 00:32:55 +0100
commit0ef7f590a72b13780494d8450f299f53463e62b3 (patch)
treec5a317a2fb5a421b391943c8a0db370bc1f6445e /initramfs/initrd-stuff/etc/functions
parentA few files which are propably needed by udevd + version update (gentoo) (diff)
downloadcore-0ef7f590a72b13780494d8450f299f53463e62b3.tar.gz
core-0ef7f590a72b13780494d8450f299f53463e62b3.tar.xz
core-0ef7f590a72b13780494d8450f299f53463e62b3.zip
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
Diffstat (limited to 'initramfs/initrd-stuff/etc/functions')
-rw-r--r--initramfs/initrd-stuff/etc/functions6
1 files changed, 4 insertions, 2 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";