diff options
| author | Dirk von Suchodoletz | 2006-04-06 21:58:13 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-04-06 21:58:13 +0200 |
| commit | 378a8cb895309133a40f57495a4dd4f9b177c378 (patch) | |
| tree | f61dd5ff1332f941dd2d0a27c6f90a59be556d9a /installer | |
| parent | do nfs over tcp, unset env. variables after initrd (diff) | |
| download | core-378a8cb895309133a40f57495a4dd4f9b177c378.tar.gz core-378a8cb895309133a40f57495a4dd4f9b177c378.tar.xz core-378a8cb895309133a40f57495a4dd4f9b177c378.zip | |
minor corrections ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@171 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
| -rwxr-xr-x | installer/ld4-inst | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/installer/ld4-inst b/installer/ld4-inst index 88d314df..94b2265d 100755 --- a/installer/ld4-inst +++ b/installer/ld4-inst @@ -8,7 +8,7 @@ # # Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg # -# Version: 0.2.0b +# Version: 0.2.0d header() { echo @@ -242,8 +242,10 @@ create_nbd() { if [ "$nbdyes" = "yes" -o "$nbdyes" = "y" -o "$nbdyes" = "Y" ] ; then # TODO: mksquashfs (background process) if [ "$nbdfs" = "squashfs" ] ; then - echo -e "\nGenerating SquashFS imge ${rootdir}.squashfs (ca. 30 min.)" - if `which mksquashfs` ; then + echo -e "\nGenerating SquashFS image ${rootdir}.squashfs (ca. 30 min.)" + if `which mksquashfs &>/dev/null` ; then + mv ${rootdir}.squashfs ${rootdir}.squashfs.old + echo "mksquashfs ${rootdir} ${rootdir}.squashfs" mksquashfs ${rootdir} ${rootdir}.squashfs & else echo -e "Tool 'mksquashfs' not found, skipping" @@ -338,7 +340,7 @@ setup_server () { # nfs echo -e "#/etc/exports - file generated by $0\n\ -# for backups of this file please check /etc/dxs directory\ +# for backups of this file please check /etc/dxs directory\n\ # NFS export entry for DXS\n\ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \ >> ${dxs_conf}/${dxs_exports_conf}-${timestamp} @@ -365,19 +367,21 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \ default_string="" fi 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 \ - APPEND nfsroot=${server}:${rootdir} initrd=${server}::${tftpbootdir}/initrd-dxs-${current_kernel} apic dhcp noldsc vci=DXS\n \ - ipappend 1\n\n" >> ${dxs_conf}/${dxs_pxedefault_conf}-${timestamp} + MENU LABEL $j. ${client_distro}-${client_distro_ver} ${current_kernel} Diskless\n\ + KERNEL ${server}::${tftpbootdir}/vmlinuz-${current_kernel}\n\ + APPEND nfsroot=${server}:${rootdir} initrd=${server}::${tftpbootdir}/initrd-dxs-${current_kernel} \ + apic dhcp noldsc debug=$debuglevel vci=DXS\n\ + ipappend 1\n" >> ${dxs_conf}/${dxs_pxedefault_conf}-${timestamp} if [ -n "$nbdyes" ] ; then j=$j+1 # 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 \ - APPEND nbdroot=${server}:5000,${nbdfs} initrd=${server}::${tftpbootdir}/initrd-dxs-${current_kernel} apic dhcp noldsc vci=DXS\n \ - ipappend 1\n\n" >> ${dxs_conf}/${dxs_pxedefault_conf}-${timestamp} + 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\ + ipappend 1\n" >> ${dxs_conf}/${dxs_pxedefault_conf}-${timestamp} fi j=$j+1 @@ -453,6 +457,7 @@ header precheck #(run as root, rsync etc.) configure copy_system +create_nbd create_initrd setup_server footer |