summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-05-20 17:29:02 +0200
committerDirk von Suchodoletz2006-05-20 17:29:02 +0200
commit171214409014ae4ea323ec7d8be03b9ad9a8febc (patch)
treec101d4d453ddebfe9f930c17ca80a2e14a3937fe /installer
parentfixes in the installer (dhcpd.conf on SuSE servers), ... (diff)
downloadcore-171214409014ae4ea323ec7d8be03b9ad9a8febc.tar.gz
core-171214409014ae4ea323ec7d8be03b9ad9a8febc.tar.xz
core-171214409014ae4ea323ec7d8be03b9ad9a8febc.zip
installer bug (adding of nbd modules failed) fixed ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@224 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
-rwxr-xr-xinstaller/ld4-inst9
1 files changed, 4 insertions, 5 deletions
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