Improved version of CD preboot test with RootFS type to choose ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1589 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 18 insertions, 9 deletions

diff --git a/initramfs/cdboot/init b/initramfs/cdboot/init
index 5562c167..78282b83 100755
--- a/initramfs/cdboot/init
+++ b/initramfs/cdboot/init
@@ -103,6 +103,12 @@ for opts in ${KCMDLINE} ; do
     # ... or a specified debug level (will be passed to next stage)
     debug=*)
       DEBUGLEVEL=${opts#debug=};;
+    nbd)
+      file=irfsnbd;;
+    nfs)
+      file=irfsnfs;;
+    dnbd2)
+      file=irfsd2;;
   esac
 done
 # at this point a timer should be started to ensure an automated reboot
@@ -161,7 +167,7 @@ echo "Fetching selected kernel and initial ramfs 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 \
-  ftp://openslx:OpenS1X@archive.ruf.uni-freiburg.de/iramfs 2>/dev/null ) || \
+  ftp://openslx:OpenS1X@archive.ruf.uni-freiburg.de/$file 2>/dev/null ) || \
   /bin/ash
 
 # start a debug shell if needed, else set quiet kernel parameter
diff --git a/initramfs/cdboot/mkcdboot b/initramfs/cdboot/mkcdboot
index 4787f27a..bea5f20f 100755
--- a/initramfs/cdboot/mkcdboot
+++ b/initramfs/cdboot/mkcdboot
@@ -64,14 +64,17 @@ MENU ROWS 9\nMENU TABMSGROW 15\nMENU CMDLINEROW 15\nMENU ENDROW -1\n\
 MENU TIMEOUTROW 15\nMENU HELPMSGROW 15\nMENU HELPMSGENDROW -1\n\
 MENU HSHIFT 0\nMENU VSHIFT 5\n\nMENU TITLE OpenSLX PreBoot ISO\
 " > ${BUILDDIR}/iso/isolinux/isolinux.cfg
-echo -e "LABEL OpenSLX\n\tMENU LABEL Test to boot an OpenSLX Client" \
-  >> ${BUILDDIR}/iso/isolinux/isolinux.cfg
-echo -e "\tTEXT HELP\n\tYou should have DHCP running ...\n\tFor more \
+for i in NBD NFS DNBD2 ; do
+  echo -e "LABEL OpenSLX\n\tMENU LABEL OpenSLX Client with $i as RootFS" \
+    >> ${BUILDDIR}/iso/isolinux/isolinux.cfg
+  echo -e "\tTEXT HELP\n\tYou should have DHCP running ...\n\tFor more \
 information on this project consult the homepage on\n\t\t\
 http://www.openslx.org\n\tENDTEXT" \
-  >> ${BUILDDIR}/iso/isolinux/isolinux.cfg
-echo -e "\tKERNEL vmlinuz\n\tAPPEND initrd=cdirfs quiet" \
-  >> ${BUILDDIR}/iso/isolinux/isolinux.cfg
+    >> ${BUILDDIR}/iso/isolinux/isolinux.cfg
+  type=$(echo $i|tr [:upper:] [:lower:])
+  echo -e "\tKERNEL vmlinuz\n\tAPPEND initrd=cdirfs $type quiet" \
+    >> ${BUILDDIR}/iso/isolinux/isolinux.cfg
+done
 
 # write some info, if CD/DVD is still in drive
 echo -e "You seem to have the OpenSLX network demo CD/DVD still in your \
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index a6979800..6eaa3538 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -466,7 +466,7 @@ if [ -n "${bldmod}" ] ; then
       # quickhack, should be read in from URI
       echo 1 > /sys/block/vnbd0/config/vid
       echo 1 > /sys/block/vnbd0/config/rid
-      echo noop > /sys/block/vnbd0/queue/scheduler
+      echo deadline > /sys/block/vnbd0/queue/scheduler
       i=0
       while [ $(cat /sys/block/vnbd0/config/running) != 1 ] ; do
         echo 1 > /sys/block/vnbd0/config/running
@@ -476,7 +476,7 @@ if [ -n "${bldmod}" ] ; then
           error "$init_dnbd2s"; break
         fi
       done
-      # echo "0" > /sys/block/vnbd0/queue/read_ahead_kb
+      # echo "256" > /sys/block/vnbd0/queue/read_ahead_kb
       ;;
     # dnbd by Thorsten Zitterell
     dnbd)