From 1d50db3f479d16dba9b77f5daebb5a11c4348570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 11 Sep 2019 18:50:35 +0200 Subject: [PATCH] rpm: set default kernel version based on package flavor If default kernel was from kernel-latest, update default kernel property on kernel-latest update (only). Same for other kernel package flavor. Suggested by @hexagonrecursion Fixes QubesOS/qubes-issues#5309 --- kernel.spec.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel.spec.in b/kernel.spec.in index 77769f0..fe06330 100644 --- a/kernel.spec.in +++ b/kernel.spec.in @@ -555,13 +555,16 @@ rmdir /tmp/qubes-modules-%kernelrelease mv /tmp/qubes-modules-%kernelrelease.img %vm_install_dir/modules.img %endif -%if "%{?name_suffix}" == "" +current_default="$(qubes-prefs default-kernel)" +current_default_path="/var/lib/qubes/vm-kernels/$current_default" +current_default_package="$(rpm --qf '%{NAME}' -qf "$current_default_path")" +if [ "$current_default_package" = "%{name}-qubes-vm" ]; then # Set kernel as default VM kernel if we are the default package. # If qubes-prefs isn't installed yet, the default kernel will be set by %post # of qubes-core-dom0 type qubes-prefs &>/dev/null && qubes-prefs --set default-kernel %version-%plainrel -%endif +fi exit 0