From 5ee2374bb76c2838cdef13258afc318c72e5894b Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sat, 20 May 2006 16:01:26 +0000
Subject: elevator="noop" needed for nbd/squashfs - added in ld4-inst

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@225 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 installer/ld4-inst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'installer')

diff --git a/installer/ld4-inst b/installer/ld4-inst
index 04ac2947..4996d7fa 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -447,7 +447,7 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \
   MENU LABEL $j. ${client_distro}-${client_distro_ver} ${current_kernel} Diskless NBD\n\
   KERNEL ${server}::${tftpbootdir}/vmlinuz-${current_kernel}\n\
   APPEND nbdroot=${server}:5000,${nbdfs} initrd=${server}::${tftpbootdir}/initrd-dxs-${current_kernel} \
-  apic dhcp noldsc debug=$debuglevel vci=DXS\n\
+  apic dhcp noldsc debug=$debuglevel elevator=\"noop\" vci=DXS\n\
   ipappend 1\n" >> ${dxs_conf}/${dxs_pxedefault_conf}-${timestamp}
     fi
 
@@ -488,7 +488,6 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \
       fi
       # linking files 
       # if SuSE und DHCP dann Kopie statt Link
-      echo "SD:  ${server_distro}, ${dxs_dhcpd_conf}"
       if [ ${server_distro} = "suse" ] && echo ${dxs_dhcpd_conf}|\
         grep dhcp &>/dev/null; then
         rm ${2}${extension} &>/dev/null
-- 
cgit v1.2.3-55-g7522