From fb67f24f4eff46b4792be2cd8a32127e96e44759 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 28 May 2006 19:49:03 +0000
Subject: corrected timing issue for apperance of nbd modules (within init),
 placeholder functions for distro specific stuff in /etc/functions ...

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@240 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/init | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'initrd/initrd-stuff/init')

diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 743e195e..3ba3bca4 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -2,11 +2,11 @@
 # Description:  main script for new type of initial ramdisk for
 #		linux diskless clients version 4 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-05-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 28-05-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.2.4h
+# Version:      0.2.4i
 
 # functions common for all distros, messages contains all error and info
 # output
@@ -154,10 +154,6 @@ nfsroot=\"${NFSROOT}\"\n" >> /etc/machine-setup
       VCI=${opts#vci=};;
   esac
 done
-# load block device driver if needed
-if [ -n "${NBD}" ] ; then
-  modprobe ${MODPRV} ${NBD} || error "$init_errnbd"
-fi
 # check if at least one type of IP configuration is availabe
 if [ -z "$DHCP" -a -z "$LDAP" -a -z "$IPINFO" ] ; then
   echo -e "# You did not specify any advanced configuration mode for your \
@@ -238,6 +234,9 @@ fi
 
 # if root filesystem should be imported via (d) network block device 
 if [ -n "${NBD}" ] ; then
+  # load block device driver if needed
+  modprobe ${MODPRV} ${NBD} || error "$init_errnbd"
+  # get settings for nbd-client
   nbdhost=${NBDOPT%:*}
   nbdopt=${NBDOPT#*:}
   nbdport=${nbdopt%,*}
-- 
cgit v1.2.3-55-g7522