TFTP prefix not really needed in stage3 (sorry for hassles! made tests

with all relevant clients) ...


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@422 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 17 insertions, 17 deletions

diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 98d98b3c..2da1f57f 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -437,11 +437,11 @@ else
   # 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 [ "${SLX_USE_ABSOLUTE_TFTP_PATH}" -ge 1 ]; then
-    cfgdir="${SLX_TFTPBOOT_PATH}/client-config"
-  else
-    cfgdir="client-config"
-  fi
+  #if [ "${SLX_USE_ABSOLUTE_TFTP_PATH}" -ge 1 ]; then
+  #  local cfgdir="${SLX_TFTPBOOT_PATH}/client-config"
+  #else
+    local cfgdir="client-config"
+  #fi
   local tftpserver=$serverip
   # try to get configuration files successively; start with distro client
   # and try last distro default ...
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd
index 017c2289..7af712ae 100755
--- a/initramfs/mkdxsinitrd
+++ b/initramfs/mkdxsinitrd
@@ -185,10 +185,10 @@ copy_distro_stuff() {
   # fixme!! files should be taken from /usr/share/openslx/distro-specs
   cat distro-specs/$1/config-default >${INSTDIR}/etc/sysconfig/config
   cat distro-specs/$1/config-$2 >>${INSTDIR}/etc/sysconfig/config
-  [ -f $SLX_CONFIG_PATH/settings.default ] && \
-     cat $SLX_CONFIG_PATH/settings.default >>${INSTDIR}/etc/sysconfig/config
-  [ -f $SLX_CONFIG_PATH/settings.local ] && \
-     cat $SLX_CONFIG_PATH/settings.local >>${INSTDIR}/etc/sysconfig/config
+  #[ -f $SLX_CONFIG_PATH/settings.default ] && \
+  #   cat $SLX_CONFIG_PATH/settings.default >>${INSTDIR}/etc/sysconfig/config
+  #[ -f $SLX_CONFIG_PATH/settings.local ] && \
+  #   cat $SLX_CONFIG_PATH/settings.local >>${INSTDIR}/etc/sysconfig/config
   cat distro-specs/$1/functions-default >${INSTDIR}/etc/distro-functions
   cat distro-specs/$1/functions-$2 >>${INSTDIR}/etc/distro-functions
   # would be cool not to copy .svn here ...
diff --git a/initramfs/slxmkramfs b/initramfs/slxmkramfs
index 3ed3b7dc..b479eac5 100755
--- a/initramfs/slxmkramfs
+++ b/initramfs/slxmkramfs
@@ -52,10 +52,10 @@ D_XFONTPATH="<set in ~/distro-config/distro file>"
 D_DEFAULTCOUNTRY="<set in ~/distro-config/distro file>"
 # read in the global settings
 SLX_CONFIG_PATH=@@@SLX_CONFIG_PATH@@@
-[ -f $SLX_CONFIG_PATH/settings.default ] && \
-   . $SLX_CONFIG_PATH/settings.default
-[ -f $SLX_CONFIG_PATH/settings.local ] && \
-   . $SLX_CONFIG_PATH/settings.local
+[ -f ${SLX_CONFIG_PATH}/settings.default ] && \
+   . ${SLX_CONFIG_PATH}/settings.default
+[ -f ${SLX_CONFIG_PATH}/settings.local ] && \
+   . ${SLX_CONFIG_PATH}/settings.local
 
 #########################################################################
 # End of global variable declaration, nothing needed to be changed at
@@ -169,10 +169,10 @@ copy_distro_stuff() {
   prefix=${SLX_SHARE_PATH}/distro-specs/$1
   cat $prefix/config-default >${INSTDIR}/etc/sysconfig/config
   cat $prefix/config-$2 >>${INSTDIR}/etc/sysconfig/config
-  [ -f $SLX_CONFIG_PATH/settings.default ] && \
-     cat $SLX_CONFIG_PATH/settings.default >>${INSTDIR}/etc/sysconfig/config
-  [ -f $SLX_CONFIG_PATH/settings.local ] && \
-     cat $SLX_CONFIG_PATH/settings.local >>${INSTDIR}/etc/sysconfig/config
+  #[ -f $SLX_CONFIG_PATH/settings.default ] && \
+  #   cat $SLX_CONFIG_PATH/settings.default >>${INSTDIR}/etc/sysconfig/config
+  #[ -f $SLX_CONFIG_PATH/settings.local ] && \
+  #   cat $SLX_CONFIG_PATH/settings.local >>${INSTDIR}/etc/sysconfig/config
   cat $prefix/functions-default >${INSTDIR}/etc/distro-functions
   cat $prefix/functions-$2 >>${INSTDIR}/etc/distro-functions
   cp -a $prefix/files-default ${INSTDIR}/etc/sysconfig/files 2>/dev/null