summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-09-07 23:46:31 +0200
committerDirk von Suchodoletz2006-09-07 23:46:31 +0200
commitfaae7cc8eecda6c1477742ee63273f1bed784caf (patch)
treeb701ccfe81311985bc3afa81f682b18e1b431c67 /installer
parentchmod -m a+t for /etc/vmware/fd-loochmod -m a+t for /etc/vmware/fd-loopp (diff)
downloadcore-faae7cc8eecda6c1477742ee63273f1bed784caf.tar.gz
core-faae7cc8eecda6c1477742ee63273f1bed784caf.tar.xz
core-faae7cc8eecda6c1477742ee63273f1bed784caf.zip
Altered variable style for various client rootfilesystem types, use
rootfs=proto://server:port/path (or filesystem) instead of separate (d)nbdroot=, nfsroot= variables. This allows to add further protocols for rootfilesystem (AoE, iSCSI, ...) if needed easily. Honour user/admin provided kdmrc or gdm.conf (via ConfTGZ - if a file is found, slx setup is skipped for these files) ... git-svn-id: http://svn.openslx.org/svn/openslx/trunk@360 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
-rwxr-xr-xinstaller/ld4-inst6
1 files changed, 3 insertions, 3 deletions
diff --git a/installer/ld4-inst b/installer/ld4-inst
index a1479d8b..686f168b 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -4,7 +4,7 @@
# cloning from rsync source for Diskless X Stations (v4.0)
#
# Author(s): Nico Dietrich, 04-04-2006
-# Dirk von Suchodoletz <dirk@goe.net>, 31-08-2006
+# Dirk von Suchodoletz <dirk@goe.net>, 07-09-2006
# Michael Janczyk, <mj0>, 06-07-2006
#
# Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg
@@ -445,7 +445,7 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \
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} apic dhcp noldsc debug=$debuglevel vci=DXS \
+ APPEND rootfs=nfs://${server}${rootdir} apic dhcp noldsc debug=$debuglevel vci=DXS \
initrd=${server}::${tftpbootdir}/initrd-dxs-${current_kernel} \n\
ipappend 1\n" >> ${dxs_conf}/${dxs_pxedefault_conf}-${timestamp}
@@ -455,7 +455,7 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \
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} apic dhcp noldsc debug=$debuglevel elevator=\"noop\" vci=DXS \
+ APPEND rootfs=nbd://${server}:5000/${nbdfs} apic dhcp noldsc debug=$debuglevel elevator=\"noop\" vci=DXS \
initrd=${server}::${tftpbootdir}/initrd-dxs-${current_kernel}\n\
ipappend 1\n" >> ${dxs_conf}/${dxs_pxedefault_conf}-${timestamp}
fi