diff options
| -rwxr-xr-x | initramfs/cdboot/init | 5 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/init | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/initramfs/cdboot/init b/initramfs/cdboot/init index 78282b83..dd0af295 100755 --- a/initramfs/cdboot/init +++ b/initramfs/cdboot/init @@ -104,10 +104,13 @@ for opts in ${KCMDLINE} ; do debug=*) DEBUGLEVEL=${opts#debug=};; nbd) + type=nbd file=irfsnbd;; nfs) + type=nfs file=irfsnfs;; dnbd2) + type=dnbd2 file=irfsd2;; esac done @@ -163,7 +166,7 @@ ip route add default via $router # user choose what kind of SLX client he wants to get # get kernel and initramfs, if something fails start debug shell -echo "Fetching selected kernel and initial ramfs from the net ..." +echo "Fetching selected kernel and initial ramfs ($type) from the net ..." ( wget -q -c -O /tmp/kernel \ ftp://openslx:OpenS1X@archive.ruf.uni-freiburg.de/kernel 2>/dev/null && \ wget -q -c -O /tmp/iramfs \ diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 6eaa3538..d7ed6037 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -442,8 +442,7 @@ if [ -n "${bldmod}" ] ; then done usleep 100 echo deadline > /sys/block/nbd0/queue/scheduler - # switch off unneeded block read ahead - echo "0" > /sys/block/nbd0/queue/read_ahead_kb + # echo "32" > /sys/block/nbd0/queue/read_ahead_kb ;; # dnbd2 by Vito Di Leo dnbd2) @@ -468,6 +467,7 @@ if [ -n "${bldmod}" ] ; then echo 1 > /sys/block/vnbd0/config/rid echo deadline > /sys/block/vnbd0/queue/scheduler i=0 + sleep 1 while [ $(cat /sys/block/vnbd0/config/running) != 1 ] ; do echo 1 > /sys/block/vnbd0/config/running usleep 5000 @@ -476,7 +476,7 @@ if [ -n "${bldmod}" ] ; then error "$init_dnbd2s"; break fi done - # echo "256" > /sys/block/vnbd0/queue/read_ahead_kb + echo "32" > /sys/block/vnbd0/queue/read_ahead_kb ;; # dnbd by Thorsten Zitterell dnbd) |