On 2014年07月02日 20:36, Dinar valeev wrote:
From: Dinar Valeev <dvaleev(a)suse.com>
Add SLES 12 information and set openSUSE's version to 13.1
Signed-off-by: Dinar Valeev <dvaleev(a)suse.com>
---
src/kimchi/isoinfo.py | 1 +
src/kimchi/osinfo.py | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py
index b7315e0..c394a32 100644
--- a/src/kimchi/isoinfo.py
+++ b/src/kimchi/isoinfo.py
@@ -95,6 +95,7 @@ iso_dir = [
'|HRM_CENA_X64CHKV|HRM_CPRA_X64FREV|HRM_CPRNA_X64FREV')),
('sles', '10', 'SLES10|SUSE-Linux-Enterprise-Server.001'),
('sles', '11', 'SUSE_SLES-11-0-0'),
+ ('sles', '12', 'SLE-12'),
('sles', lambda m: "11sp%s" % m.group(1),
'SLES-11-SP(\d+)'),
('opensuse', lambda m: m.group(1), 'openSUSE[ -](\d+\.\d+)'),
('opensuse', '11.1', 'SU1110.001'),
diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py
index 093feca..0cf005e 100644
--- a/src/kimchi/osinfo.py
+++ b/src/kimchi/osinfo.py
@@ -58,9 +58,12 @@ template_specs = {'x86': {'old': dict(common_spec,
disk_bus='ide',
modern_version_bases = {'x86': {'debian': '6.0',
'ubuntu': '7.10',
'opensuse': '10.3', 'centos':
'5.3',
- 'rhel': '6.0', 'fedora':
'16', 'gentoo': '0'},
+ 'rhel': '6.0', 'fedora':
'16', 'gentoo': '0',
+ 'sles': '11', 'sles':
'12'},
According to
https://www.suse.com/documentation/sles11/singlehtml/book_kvm/book_kvm.html,
from SLES11 on, pv is supported so the modern_base_version for sles is
'11', which means version>11 or judged to be modern,
So '12' need to be deleted.
'power': {'rhel':
'7.0', 'fedora': '19',
- 'ubuntu': '14.04'}}
+ 'ubuntu': '14.04',
+ 'opensuse': '13.1',
+ 'sles': '12'}}
icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/'
% paths.ui_dir, 'icon-*.png')]