From e22c41cdf7b80e945370973ab96703a1a93e1191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 30 May 2018 04:04:59 +0200
Subject: [PATCH] qubes-release: schedule keys import after update

It isn't possible to import rpm signing keys during update, because
rpm itself holds a lock. Schedule the operation after update using
systemd-run.

Fixes QubesOS/qubes-issues#3756

(cherry picked from commit 7d5bb6ff81a2adf8b47a08841415477a099121a5)
---
 qubes-release/qubes-release.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qubes-release/qubes-release.spec b/qubes-release/qubes-release.spec
index 93d4521..200735d 100644
--- a/qubes-release/qubes-release.spec
+++ b/qubes-release/qubes-release.spec
@@ -99,7 +99,7 @@ EOF
 
 %post
 # Import all keys b/c rpm won't do it automatically (as opposite to yum)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* || true
+systemd-run --on-active=5min rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-*
 
 
 %clean