summaryrefslogtreecommitdiffstats
path: root/initrd/initrd-stuff/init
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-02-04 19:46:58 +0100
committerDirk von Suchodoletz2006-02-04 19:46:58 +0100
commita04aab4336059b0726d4941b7d2e7c4a1126a81f (patch)
tree4f1763a85e0cd420302468ac5c10c44316b09f09 /initrd/initrd-stuff/init
parentIntroduced nbd to initial ramdisk (as alternative to NFS). Works mostly (diff)
downloadcore-a04aab4336059b0726d4941b7d2e7c4a1126a81f.tar.gz
core-a04aab4336059b0726d4941b7d2e7c4a1126a81f.tar.xz
core-a04aab4336059b0726d4941b7d2e7c4a1126a81f.zip
Small bug in init prevented system to start with NFS root filesystem.
git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@60 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/init')
-rwxr-xr-xinitrd/initrd-stuff/init8
1 files changed, 5 insertions, 3 deletions
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 34f01cce..e85c0d9e 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -2,13 +2,13 @@
# Description: main script for new type of initial ramdisk for
# linux diskless clients version 4
#
-# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 03-02-2006
+# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 04-02-2006
# Bla
# Blub
#
# Copyright: (c) 2006 - RZ Universitaet Freiburg
#
-# Version: 0.2.1b
+# Version: 0.2.1c
# functions common for all distros
errmsg="functions file contains a lot of script \
@@ -126,9 +126,11 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup
esac
done
# load block device driver if needed
-[ -n "$NBD" ] && modprobe ${MODPRV} ${NBD} || error " Failed to load \
+if [ -n "${NBD}" ] ; then
+ modprobe ${MODPRV} ${NBD} || error " Failed to load \
module ${NBD}.ko. It is needed if you intend to use\n network block \
device (D)NBD for the client as root filesystem."
+fi
# check if at least one type of IP configuration is availabe
if [ -z "$DHCP" -a -z "$LDAP" -a -z "$IPINFO" ] ; then
if strinfile "clientip" /etc/machine-setup ; then