summaryrefslogtreecommitdiffstats
path: root/initrd/initrd-stuff/etc/functions
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-01-20 22:20:37 +0100
committerDirk von Suchodoletz2006-01-20 22:20:37 +0100
commit7caead1022ee2d8e96ca9be56ddb5be57a86c5c2 (patch)
tree944a2bc456db8c5d28a691ee90b7660349f396aa /initrd/initrd-stuff/etc/functions
parentHeftiges Bugfixing in mkdxsinitrd ... intensiv gecheckt mit SuSE 10.0 - (diff)
downloadcore-7caead1022ee2d8e96ca9be56ddb5be57a86c5c2.tar.gz
core-7caead1022ee2d8e96ca9be56ddb5be57a86c5c2.tar.xz
core-7caead1022ee2d8e96ca9be56ddb5be57a86c5c2.zip
Kleinere Bugs in init und dhcpmkconfig gefixt. boot.ld für initialen
Start via Runlevel angepasst. Weitere Tests durchgeführt mit verschiedenen Kernel Commandline Parametern ... git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@30 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/etc/functions')
-rw-r--r--initrd/initrd-stuff/etc/functions11
1 files changed, 6 insertions, 5 deletions
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 9418b637..15237680 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -130,8 +130,9 @@ running kernel - see error messages above\n\
for mnt in nfsmount mount none; do
test -x /bin/$mnt && break;
done
-loadmod /lib/modules/@@@KERNVER@@@/kernel/fs/nfs/nfs.ko \
- "needed for mounting rootfs"
+[ -f /lib/modules/@@@KERNVER@@@/kernel/fs/nfs/nfs.ko ] && \
+ loadmod /lib/modules/@@@KERNVER@@@/kernel/fs/nfs/nfs.ko \
+ "needed for mounting rootfs"
case $mnt in
nfsmount)
nfsmount -o ro $nfsroot /mnt || error $errmsg
@@ -140,7 +141,6 @@ case $mnt in
portmap || error " Portmapper should be present, if normal mount \
command is used. Please\n check your initial ramdisk setup (mkdxsinitrd)."
mount -n -t nfs -o ro $nfsroot /mnt || error $errmsg
-
killall -9 portmap
;;
none)
@@ -196,8 +196,9 @@ if [ "$dhcp" = "none" ] ; then
else
# ensure the interface is up
ipsetup 0.0.0.0 255.255.255.255 0.0.0.0 255.255.255.255 eth0 &
- loadmod /lib/modules/@@@KERNVER@@@/kernel/net/packet/af_packet.ko \
- "needed for dhcp";
+ [ -f /lib/modules/@@@KERNVER@@@/kernel/net/packet/af_packet.ko ] && \
+ loadmod /lib/modules/@@@KERNVER@@@/kernel/net/packet/af_packet.ko \
+ "needed for dhcp";
echo "Starting $dhcp for configuration"
mkdir /var/lib/dhcp 2>&1 >/dev/null
fi