diff options
| author | Dirk von Suchodoletz | 2007-03-01 23:33:15 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-03-01 23:33:15 +0100 |
| commit | 0bc0de926455aacd2140c216335b0f91eefe85e2 (patch) | |
| tree | 384cc529e7d984a2b548201be89d6231cc572504 /installer | |
| parent | Small bug ... (diff) | |
| download | core-0bc0de926455aacd2140c216335b0f91eefe85e2.tar.gz core-0bc0de926455aacd2140c216335b0f91eefe85e2.tar.xz core-0bc0de926455aacd2140c216335b0f91eefe85e2.zip | |
Heavy cleanup, proper variable assignement for D_XORGBIN (instead of
XBinPath in displayvars), bugfix ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@740 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
| -rwxr-xr-x | installer/ld4-inst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/installer/ld4-inst b/installer/ld4-inst index 5a6bcbe3..af12dcf8 100755 --- a/installer/ld4-inst +++ b/installer/ld4-inst @@ -443,7 +443,7 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \ declare -i j=0 while [ $j -lt ${#choice[@]} ] ; do current_kernel=${kernel[${choice[$j]}]#${rootdir}/boot/vmlinuz-} - current_initramfs=${tftpbootdir}/initrd-dxs-${current_kernel} + current_initramfs=initrd-dxs-${current_kernel} if [ $j -eq 0 ] ; then default_string=" MENU DEFAULT\n" @@ -454,9 +454,9 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \ # last (needed only for loading with pxelinux) echo -e "LABEL ${client_distro}-${current_kernel}\n${default_string}\ MENU LABEL $j. ${client_distro}-${client_distro_ver} ${current_kernel} Diskless\n\ - KERNEL ${server}::${tftpbootdir}/vmlinuz-${current_kernel}\n\ + KERNEL ${server}::vmlinuz-${current_kernel}\n\ APPEND rootfs=nfs://${server}${rootdir} apic dhcp noldsc debug=$debuglevel vci=DXS \ - initrd=${server}::${tftpbootdir}/initrd-dxs-${current_kernel} \n\ + initrd=${server}::initrd-dxs-${current_kernel} \n\ ipappend 1\n" >> ${dxs_conf}/${dxs_pxedefault_conf}-${timestamp} if isyes "$nbdyes" ; then @@ -464,9 +464,9 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \ # create configs for nbd/squashfs kernels too echo -e "LABEL ${client_distro}-${current_kernel}-nbd\n\ MENU LABEL $j. ${client_distro}-${client_distro_ver} ${current_kernel} Diskless NBD\n\ - KERNEL ${server}::${tftpbootdir}/vmlinuz-${current_kernel}\n\ + KERNEL ${server}::vmlinuz-${current_kernel}\n\ APPEND rootfs=nbd://${server}:5000/${nbdfs} apic dhcp noldsc debug=$debuglevel elevator=\"noop\" vci=DXS \ - initrd=${server}::${tftpbootdir}/initrd-dxs-${current_kernel}\n\ + initrd=${server}::initrd-dxs-${current_kernel}\n\ ipappend 1\n" >> ${dxs_conf}/${dxs_pxedefault_conf}-${timestamp} fi |