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

3 files changed, 9 insertions, 11 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
diff --git a/os-plugins/plugins/xen/OpenSLX/OSPlugin/xen.pm b/os-plugins/plugins/xen/OpenSLX/OSPlugin/xen.pm
index 4a8288c8..5e500b49 100644
--- a/os-plugins/plugins/xen/OpenSLX/OSPlugin/xen.pm
+++ b/os-plugins/plugins/xen/OpenSLX/OSPlugin/xen.pm
@@ -28,7 +28,7 @@ sub new
     my $class = shift;
 
     my $self = {
-        name => 'bootsplash',
+        name => 'xen',
     };
 
     return bless $self, $class;
@@ -71,7 +71,7 @@ sub suggestAdditionalKernelModules
 
     my @suggestedModules;
     
-    # Ubuntu needs vesafb and fbcon (which drags along some others)
+    # Xen needs bridge module and for SUSE 10.2 netloop other OS: to be checked
     if ($makeInitRamFSEngine->{'distro-name'} =~ m{^suse}i) {
         push @suggestedModules, qw( bridge netloop )
     }
diff --git a/os-plugins/plugins/xen/init-hooks/10-have-nw-modules/xen.sh b/os-plugins/plugins/xen/init-hooks/10-have-nw-modules/xen.sh
index 3886c00d..47edd682 100644
--- a/os-plugins/plugins/xen/init-hooks/10-have-nw-modules/xen.sh
+++ b/os-plugins/plugins/xen/init-hooks/10-have-nw-modules/xen.sh
@@ -1,6 +1,5 @@
 # configure Xen bridge xenbr0
 xenbr_config () {
-  echo -e "Configuring Xen...\c"
   modprobe ${MODPRV} netloop
   local ipls
   local vifnum="0"
@@ -23,6 +22,5 @@ xenbr_config () {
     ip link set ${ipls}
   done
   brctl addif ${bridge} ${pdev}
-  echo " OK"
   exit 0
 }