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

3 files changed, 20 insertions, 25 deletions

diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index bf8aff1f..9f647ff4 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -2,7 +2,7 @@
 # (included by init, hwautocfg, servconfig, ... within OpenSLX initial
 # ramfs)
 #
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 31-10-2006
+# Dirk von Suchodoletz <dvs@OpenSLX.com>, 14-11-2006
 # Felix Endres, 30-04-2006
 # <mj0@uni-freiburg.de> (xenbr), 27-09-2006
 # Tobias Maier
@@ -17,19 +17,19 @@
 
 # distro specific funtion called at the beginning of init script
 preinit () {
-  :
+:
 }
 # distro specific funtion called at the end of init script
 postinit () {
-  :
+:
 }
 # distro specific general function called from servconfig script
 config_distro () {
-  :
+:
 }
 # udev/hotplug - auto device discovery service
 udev_hotplug () {
- :
+:
 }
 
 
@@ -450,16 +450,10 @@ if [ -n "$FILESRC" ] ; then
   tftpserver=$(uri_token $FILESRC server)
   tftpgetunpack $tftp $cfgfile $tftpserver
 else
-  # usually the tftp-server serves relative to $SLX_TFTPBOOT_PATH, however,
-  # some tftp-servers aren't setup to do that but serve from / instead.
-  # In order to remedy, we evaluate $SLX_USE_ABSOLUTE_TFTP_PATH in order
-  # to find out if we should use the absolute path when accessing files
-  # via tftp:
-  #if [ "${slxconf_tftp_prefix}" -ge 1 ]; then
-  #  local cfgdir="${slxconf_tftp_prefix}/client-config"
-  #else
-    local cfgdir="client-config"
-  #fi
+  # predefined value for openslx environment; it is expected that this
+  # directory is just below the tftpboot/tftproot (path to which the 
+  # daemon is restricted to)
+  local cfgdir="client-config"
   local tftpserver=$serverip
   # try to get configuration files successively; start with distro client
   # and try last distro default ...
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"