From 7d4d42c6f5d6834174fccf356e35d43b5bd89338 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Fri, 29 Feb 2008 21:50:06 +0000
Subject: Trying on another export type -> dnbd2 ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1585 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/init | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index f47092cc..a6979800 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -441,7 +441,7 @@ if [ -n "${bldmod}" ] ; then
         fi
       done
       usleep 100
-      echo noop > /sys/block/nbd0/queue/scheduler
+      echo deadline > /sys/block/nbd0/queue/scheduler
       # switch off unneeded block read ahead
       echo "0" > /sys/block/nbd0/queue/read_ahead_kb
       ;;
@@ -450,7 +450,8 @@ if [ -n "${bldmod}" ] ; then
       RDEV=/dev/vnbd0
       waitfor "${RDEV}" 20000 || error "$init_nbddev"
       # check for others in machine-setup and then kernel cmdline
-      rootfs="$(sed -n "/rootfs=/p" /etc/machine-setup|sed "s,rootfs=,,;s,\",,g") "
+      rootfs="$(sed -n "/rootfs=/p" /etc/initramfs-setup| \
+        sed "s,rootfs=,,;s,\",,g") "
       [ -z "$rootfs" ] && \
         rootfs="$(cat /proc/cmdline|sed "s,.*rootfs=\",,;s,\".*,,") "
       i=0
-- 
cgit v1.2.3-55-g7522