From 171214409014ae4ea323ec7d8be03b9ad9a8febc Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sat, 20 May 2006 15:29:02 +0000
Subject: installer bug (adding of nbd modules failed) fixed ...

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@224 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 installer/ld4-inst | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'installer')

diff --git a/installer/ld4-inst b/installer/ld4-inst
index 4d6453a5..04ac2947 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -353,11 +353,10 @@ separated numbers) " kernel_choice "${kernel_choice}"
   mkdir -p ${tftpbootdir}
   
   declare -i j=0
-  # add nfs modules -f if nfs is choosen
+  # add nfs modules nevertheless
   fsmod=nfs
   # add nbd module and the selected filesystem ontop
   isyes "$nbdyes" && fsmod=$fsmod" nbd $nbdfs"
-  fsmod=" -f \"$fsmod\""
   # one big initrd or several smaller "specialized" ones!?
   
   # FIXME: mkdxsinitrd currently wants to run from own directory
@@ -367,8 +366,8 @@ separated numbers) " kernel_choice "${kernel_choice}"
     current_kernel=${kernel[${choice[$j]}]#${rootdir}/boot/vmlinuz-}
     echo "Creating initial ramdisk for ${current_kernel}"
     current_initrd=${tftpbootdir}/initrd-dxs-${current_kernel}
-    [ -f ${current_initrd} ] && rm ${current_initrd} 
-    ./mkdxsinitrd -r ${rootdir} -k ${current_kernel} -i ${current_initrd}
+    [ -f ${current_initrd} ] && rm ${current_initrd}
+    ./mkdxsinitrd -f "$fsmod" -r ${rootdir} -k ${current_kernel} -i ${current_initrd}
 
     ln -sf ${kernel[${choice[$j]}]} ${tftpbootdir}/vmlinuz-${current_kernel}
     j=$j+1
@@ -532,7 +531,7 @@ dxs_client_conf="client.cfg/machine-setup.default"
 header
 precheck #(run as root, rsync etc.)
 configure
-#copy_system
+copy_system
 create_nbd
 create_initrd
 setup_server
-- 
cgit v1.2.3-55-g7522