From 4291b9ea55cd1f16d6048a58434b71d650938eba Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 12 May 2011 10:20:11 +0200
Subject: Small changes for new Ubuntu 11.04 ...

---
 src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm         | 4 +++-
 src/installer/OpenSLX/OSSetup/Engine.pm                 | 4 ++--
 src/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm b/src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
index 6f180c68..300c3a76 100644
--- a/src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
+++ b/src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
@@ -99,7 +99,9 @@ sub getSquashfsVersion
         '8.10' => '3.3',
         '9.04' => '3.3',
         '9.10' => '4.0',
-        '10.04' => '4.0'
+        '10.04' => '4.0',
+        '10.10' => '4.0',
+        '11.04' => '4.0',
    );
 
    my $distroDefault = '4.0';
diff --git a/src/installer/OpenSLX/OSSetup/Engine.pm b/src/installer/OpenSLX/OSSetup/Engine.pm
index a1ad471b..e855ef97 100644
--- a/src/installer/OpenSLX/OSSetup/Engine.pm
+++ b/src/installer/OpenSLX/OSSetup/Engine.pm
@@ -58,9 +58,9 @@ use vars qw(%supportedDistros);
     'suse-11.1_x86_64'  => 'clone,update,shell',
     'suse-11.2'         => 'clone,install,update,shell',
     'suse-11.2_x86_64'  => 'clone,update,shell',
-    'suse-11.3'         => 'clone,update,shell',
+    'suse-11.3'         => 'clone,install,update,shell',
     'suse-11.3_x86_64'  => 'clone,update,shell',
-    'suse-11.4'         => 'clone,update,shell',
+    'suse-11.4'         => 'clone,install,update,shell',
     'suse-11.4_x86_64'  => 'clone,update,shell',
     'scilin-4.7'        => 'clone,update,shell',
     'scilin-5.3'        => 'clone,update,shell',
diff --git a/src/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm b/src/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm
index 057cf138..1c02bc56 100644
--- a/src/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm
+++ b/src/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2008..2010 - OpenSLX GmbH
+# Copyright (c) 2008..2011 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -60,7 +60,7 @@ sub setupXserverScript
         echo -e "${x_mouse}\n${x_monitor}\n${x_screen}" >>${xfc}
         echo "${x_srvlayout}" | sed "/ Screen /d" >>${xfc}
         testmkd /mnt/etc/X11/xorg.conf.d
-        testmkd /mnt/var/run/xauth
+        # testmkd /mnt/var/run/xauth # does not make sense, see #813
         testmkd /mnt/var/lib/xkb
         ln -sf /usr/bin/Xorg /mnt/etc/X11/X
     End-of-Here
-- 
cgit v1.2.3-55-g7522