diff options
| author | Michael Janczyk | 2008-06-11 15:35:09 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2008-06-11 15:35:09 +0200 |
| commit | 201969831145b0938194e606c66fb8db408c26de (patch) | |
| tree | ac2bd5eacf6237a0d1dba6fb57dde5a3ef2f3406 /initramfs | |
| parent | First release of a xen plugin. Only a few diskless corrections inside. Works ... (diff) | |
| download | core-201969831145b0938194e606c66fb8db408c26de.tar.gz core-201969831145b0938194e606c66fb8db408c26de.tar.xz core-201969831145b0938194e606c66fb8db408c26de.zip | |
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
Diffstat (limited to 'initramfs')
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 14 |
1 files changed, 7 insertions, 7 deletions
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 |