From 820392a4b6faf364c730f97e0cc26db5bab214e5 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Fri, 3 Aug 2007 22:55:58 +0000
Subject: Stop trying after a while if nbd-client could not be started properly
 (slx init), small mkdxsinitrd modification for cd-boot initramfs.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1317 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/init | 7 ++++++-
 initramfs/mkdxsinitrd       | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'initramfs')

diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index ccc0528d..f1f99770 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -422,8 +422,13 @@ if [ -n "${bldmod}" ] ; then
     nbd)
       RDEV=/dev/nbd0
       waitfor "${RDEV}" 20000 || error "$init_nbddev"
+      i=0
       while ! nbd-client $bldhost $bldport ${RDEV} ; do
-        usleep 10000
+        usleep 100000
+        i=$(($i + 1))
+        if [ $i -ge 1000 ] ; then
+          error "$init_nbds"; break
+        fi
       done
       usleep 100
       echo noop > /sys/block/nbd0/queue/scheduler
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd
index 7c4b70a2..dde6a5f4 100755
--- a/initramfs/mkdxsinitrd
+++ b/initramfs/mkdxsinitrd
@@ -693,6 +693,9 @@ echo "## common settings for clients sharing an InitRamFS" \
 if [ -n "${CLCONFFILE}" ] ; then
   cat ${CLCONFFILE} >>${INSTDIR}/etc/initramfs-setup
   echo "Using ${CLCONFFILE}"
+elif [ -n "$cdboot" ] ; then
+  echo -e "ramfs_nicmods=\"${NWMODULES}\"\nramfs_kernver=\"${KERNVER}\"" \
+    >>${INSTDIR}/etc/initramfs-setup
 fi
 echo "## end of common initramfs-setup" >>${INSTDIR}/etc/initramfs-setup
 
-- 
cgit v1.2.3-55-g7522