summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-11-14 13:34:32 +0100
committerDirk von Suchodoletz2006-11-14 13:34:32 +0100
commitea17c69657e4944bcf92f18b84c44d87213d8733 (patch)
tree8ba1071eaebfe38a934bbbc5ae01a11b4c3fae26 /installer
parentAdd some specific hardware to be detected (NVidia graphics adaptor) (diff)
downloadcore-ea17c69657e4944bcf92f18b84c44d87213d8733.tar.gz
core-ea17c69657e4944bcf92f18b84c44d87213d8733.tar.xz
core-ea17c69657e4944bcf92f18b84c44d87213d8733.zip
tftp path issue, see documentation too (do not use the abs. path
in servers filesystem for tftp requests) ... git-svn-id: http://svn.openslx.org/svn/openslx/trunk@509 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
-rw-r--r--installer/default_files/default14
-rw-r--r--installer/default_files/machine-setup.default7
2 files changed, 11 insertions, 10 deletions
diff --git a/installer/default_files/default b/installer/default_files/default
index 28a5471f..06c23024 100644
--- a/installer/default_files/default
+++ b/installer/default_files/default
@@ -2,7 +2,7 @@
#
# Description: Boot selection with the new Syslinux/PXElinux by Peter Anwin
# selection is done by cursor up and down keys
-DEFAULT @@@server@@@::@@@tftpbootdir@@@/menu.c32
+DEFAULT @@@server@@@::/menu.c32
PROMPT 0
NOESCAPE 1
@@ -18,11 +18,11 @@ MENU TITLE Diskless X-Stations
#####
LABEL Bitte waehlen Sie mit den Pfeil-Tasten aus:
- KERNEL ::@@@tftpbootdir@@@/menu.c32
- APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/default
+ KERNEL ::/menu.c32
+ APPEND @@@server@@@::/pxelinux.cfg/default
LABEL
- KERNEL @@@server@@@::@@@tftpbootdir@@@/menu.c32
- APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/default
+ KERNEL @@@server@@@::/menu.c32
+ APPEND @@@server@@@::/pxelinux.cfg/default
#####
LABEL local
@@ -32,6 +32,6 @@ LABEL local
#####
LABEL
- KERNEL @@@server@@@::@@@tftpbootdir@@@/menu.c32
- APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/default
+ KERNEL @@@server@@@::/menu.c32
+ APPEND @@@server@@@::/pxelinux.cfg/default
#####
diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default
index 543356e2..bcd71af5 100644
--- a/installer/default_files/machine-setup.default
+++ b/installer/default_files/machine-setup.default
@@ -1,7 +1,7 @@
# machine-setup
#
#### default file, please modify, rename it to machine-setup and copy it
-#### to a proper location, like /var/lib/openslx/config/default/initramfs
+#### to a proper location, like /var/opt/openslx/config/default/initramfs
#### several of the settings could be passed via DHCP too (vendorspecific
#### options, see dhcpd.conf example) - some settings could be done only
#### within this file (no DHCP variable definition available)
@@ -22,7 +22,8 @@
# a passwd file via extended config tgz
root_pw=@@@root_pw@@@
-# SLX-Group
+# SLX-Group used at the moment only for VMware image / session assignment
+# to a specific group of clients
#slxgrp=default
## name service configuration defaults
@@ -101,7 +102,7 @@ vmware="no"
# imgsrv is deprecated, because incorporated into vmware variable
# kind of X11 display manager to run
-start_xdmcp="xdm"
+start_xdmcp="kdm"
# for kdm/gdm - enable shutdown option on login screen "user/root/none"
dm_allow_shutdown="user"