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/OpenSLX/OSExport/Distro | |
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/OpenSLX/OSExport/Distro')
-rw-r--r-- | src/installer/OpenSLX/OSExport/Distro/Suse.pm | 5 | ||||
-rw-r--r-- | src/installer/OpenSLX/OSExport/Distro/Ubuntu.pm | 1 |
2 files changed, 4 insertions, 2 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'; |