diff options
| author | Sebastian Schmelzer | 2011-11-23 10:43:28 +0100 |
|---|---|---|
| committer | Sebastian Schmelzer | 2011-11-23 10:43:28 +0100 |
| commit | 9e2cdc4a5a0da7091e6a56e40a5b6753f1ce634d (patch) | |
| tree | 82cee5fc47bbb8aba34bda93245699791383b281 /src/installer | |
| parent | FIX for failed to read mtab (diff) | |
| parent | Further (irrelevant) adaptations ... (diff) | |
| download | core-9e2cdc4a5a0da7091e6a56e40a5b6753f1ce634d.tar.gz core-9e2cdc4a5a0da7091e6a56e40a5b6753f1ce634d.tar.xz core-9e2cdc4a5a0da7091e6a56e40a5b6753f1ce634d.zip | |
Merge branch 'master' of openslx.org:openslx/core
Diffstat (limited to 'src/installer')
| -rw-r--r-- | src/installer/OpenSLX/OSExport/Distro/Suse.pm | 5 | ||||
| -rw-r--r-- | src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm | 1 | ||||
| -rw-r--r-- | src/installer/OpenSLX/OSSetup/Engine.pm | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/installer/OpenSLX/OSExport/Distro/Suse.pm b/src/installer/OpenSLX/OSExport/Distro/Suse.pm index 79090c04..bf09f4ff 100644 --- a/src/installer/OpenSLX/OSExport/Distro/Suse.pm +++ b/src/installer/OpenSLX/OSExport/Distro/Suse.pm @@ -135,7 +135,9 @@ sub getSquashfsVersion '11.0' => '3.2', '11.1' => '3.2', '11.2' => '3.3', - '11.3' => '4.0' + '11.3' => '4.0', + '11.4' => '4.0', + '12.1' => '4.0' ); my $distroDefault = '4.0'; @@ -143,5 +145,4 @@ sub getSquashfsVersion return $versionMap{$distroVersion} || $distroDefault; } - 1; diff --git a/src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm b/src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm index 300c3a76..1443251b 100644 --- a/src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm +++ b/src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm @@ -102,6 +102,7 @@ sub getSquashfsVersion '10.04' => '4.0', '10.10' => '4.0', '11.04' => '4.0', + '11.10' => '4.0', ); my $distroDefault = '4.0'; diff --git a/src/installer/OpenSLX/OSSetup/Engine.pm b/src/installer/OpenSLX/OSSetup/Engine.pm index a3e4c1be..4dc0f917 100644 --- a/src/installer/OpenSLX/OSSetup/Engine.pm +++ b/src/installer/OpenSLX/OSSetup/Engine.pm @@ -62,6 +62,8 @@ use vars qw(%supportedDistros); 'suse-11.3_x86_64' => 'clone,update,shell', 'suse-11.4' => 'clone,install,update,shell', 'suse-11.4_x86_64' => 'clone,update,shell', + 'suse-12.1' => 'clone,install,update,shell', + 'suse-12.1_x86_64' => 'clone,update,shell', 'scilin-4.7' => 'clone,update,shell', 'scilin-5.3' => 'clone,update,shell', 'scilin-5.4_x86_64' => 'clone,update,shell', @@ -75,11 +77,9 @@ use vars qw(%supportedDistros); 'ubuntu-9.10' => 'clone,install,update,shell', 'ubuntu-9.10_amd64' => 'clone,update,shell', 'ubuntu-10.04' => 'clone,install,update,shell', - 'ubuntu-10.04_amd64'=> 'clone,update,shell', 'ubuntu-10.10' => 'clone,install,update,shell', - 'ubuntu-10.10_amd64'=> 'clone,update,shell', 'ubuntu-11.04' => 'clone,install,update,shell', - 'ubuntu-11.04_amd64'=> 'clone,update,shell', + 'ubuntu-11.10' => 'clone,install,update,shell', 'linuxmint-10' => 'clone,update,shell', 'linuxmint-11' => 'clone,update,shell', ); |