summaryrefslogtreecommitdiffstats
path: root/src/boot-env
diff options
context:
space:
mode:
authorSebastian Schmelzer2011-11-23 10:43:28 +0100
committerSebastian Schmelzer2011-11-23 10:43:28 +0100
commit9e2cdc4a5a0da7091e6a56e40a5b6753f1ce634d (patch)
tree82cee5fc47bbb8aba34bda93245699791383b281 /src/boot-env
parentFIX for failed to read mtab (diff)
parentFurther (irrelevant) adaptations ... (diff)
downloadcore-9e2cdc4a5a0da7091e6a56e40a5b6753f1ce634d.tar.gz
core-9e2cdc4a5a0da7091e6a56e40a5b6753f1ce634d.tar.xz
core-9e2cdc4a5a0da7091e6a56e40a5b6753f1ce634d.zip
Merge branch 'master' of openslx.org:openslx/core
Diffstat (limited to 'src/boot-env')
-rw-r--r--src/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm3
-rw-r--r--src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm
index 81fd27a5..d6b82984 100644
--- a/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm
+++ b/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm
@@ -54,7 +54,8 @@ sub determineMatchingHwinfoVersion
'11.1' => '15.21',
'11.2' => '16.0',
'11.3' => '16.0',
- '11.4' => '16.0'
+ '11.4' => '16.0',
+ '12.1' => '16.0'
);
return $versionMap{$distroVersion}
|| $self->SUPER::determineMatchingHwinfoVersion($distroVersion);
diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
index 7c5c561f..de56ee20 100644
--- a/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
+++ b/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
@@ -67,6 +67,7 @@ sub determineMatchingHwinfoVersion
'10.04' => '16.0',
'10.10' => '16.0',
'11.04' => '16.0',
+ '11.10' => '16.0'
);
return $versionMap{$distroVersion}
|| $self->SUPER::determineMatchingHwinfoVersion($distroVersion);