From 201969831145b0938194e606c66fb8db408c26de Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Wed, 11 Jun 2008 13:35:09 +0000
Subject: added quotes for tftp port problem (not tested yet ticket #232).
 minor modifications in xen plugin (changed name from bootsplash to xen ;))

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1874 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/etc/functions | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'initramfs')

diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 83992869..c047ce58 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -350,7 +350,7 @@ if [ "x$filepath" != "x" ] ; then
      umount /dev/$ldev
    ;;
    *)
-     tftp -g -r '$cfgfile' -l /tmp/$(basename "$cfgfile") "$fileserv"  \
+     tftp -g -r "$cfgfile" -l /tmp/$(basename "$cfgfile") $fileserv  \
        && unpack /tmp/$(basename "$cfgfile")
    ;;
    esac
@@ -365,16 +365,16 @@ else
   echo -e "\n## Configuration via fileget: Hierarchy is distro client \
 and as last\n# distro/default" >> /tmp/confviafile
   mac=$(echo $macaddr|sed "s/:/-/g")
-  for cfgfile in ${filepath}/${SYSTEM_NAME}/01-$mac.tgz \
-                 ${filepath}/${SYSTEM_NAME}/default.tgz ; do
+  for cfgfile in "${filepath}/${SYSTEM_NAME}/01-${mac}.tgz" \
+                 "${filepath}/${SYSTEM_NAME}/default.tgz" ; do
     case "$fileprot" in
       ftp|http)
-        wget $fileprot://$fileserv/$cfgfile -O /tmp/$(basename $cfgfile) \
-          2>/dev/null && { unpack /tmp/$(basename $cfgfile) && break; }
+        wget $fileprot://$fileserv/"$cfgfile" -O /tmp/$(basename "$cfgfile") \
+          2>/dev/null && { unpack /tmp/$(basename "$cfgfile") && break; }
       ;;
       tftp)
-        tftp -g -r $cfgfile -l /tmp/$(basename $cfgfile) $fileserv \
-           && { unpack /tmp/$(basename $cfgfile) && break; }
+        tftp -g -r "$cfgfile" -l /tmp/$(basename "$cfgfile") $fileserv \
+           && { unpack /tmp/$(basename "$cfgfile") && break; }
       ;;
     esac
   done
-- 
cgit v1.2.3-55-g7522