This patch adds OpenSuse and SLES to PPC modern distro dictionary. It also change RHEL version from 7.0 to 6.5. The original commit is: "b482880157292cda2247b4b67a67cbe8c6bdf86b, Author: Dinar Valeev <dvaleev@suse.com> - Date: Fri Jul 4 12:51:32" Modern distros are going to use virtio instead of spapr. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo@linux.vnet.ibm.com> --- src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index 7867b78..fb69df0 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -96,6 +96,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 245374f..698f2c6 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'}, - 'power': {'rhel': '7.0', 'fedora': '19', - 'ubuntu': '14.04'}} + 'rhel': '6.0', 'fedora': '16', 'gentoo': '0', + 'sles': '11'}, + 'power': {'rhel': '6.5', 'fedora': '19', + 'ubuntu': '14.04', + 'opensuse': '13.1', + 'sles': '11sp3'}} icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/' % paths.ui_dir, 'icon-*.png')] -- 1.9.3