From 9b4568310b32f7d391441bf9b288b0837874f3a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 30 Jan 2018 01:47:30 +0100 Subject: [PATCH] qubes-anaconda-addon: fix kernel version sorting Use proper version comparing instead of string comparing - 4.14 is newer than 4.9... --- .../org_qubes_os_initial_setup/gui/spokes/qubes_os.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py b/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py index d107784..546023d 100644 --- a/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py +++ b/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py @@ -29,6 +29,7 @@ _ = lambda x: x N_ = lambda x: x +import distutils.version import functools import grp import logging @@ -488,7 +489,9 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke): def configure_default_kernel(self): self.set_stage("Setting up default kernel") - default_kernel = sorted(os.listdir('/var/lib/qubes/vm-kernels'))[-1] + installed_kernels = os.listdir('/var/lib/qubes/vm-kernels') + installed_kernels = [distutils.version.LooseVersion(x) for x in installed_kernels] + default_kernel = str(sorted(installed_kernels)[-1]) self.run_command(['/usr/bin/qubes-prefs', 'default-kernel', default_kernel]) def configure_dom0(self):