From 747eb1d5c428091005a855c33e7bb2c48415ca96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 30 Nov 2021 22:51:59 +0100 Subject: [PATCH] dom0-update: do not send --downloadonly option to the updatevm The updatevm already downloads packages only (either using --downloadonly option internally, or using yumdownloader). The option from the user matters for the dnf call in dom0 only. Especially, sending --downloadonly breaks downloading updates via debian-10, which uses yumdownloader, as it doesn't have --downloadonly option. This is mostly relevant for R4.0 -> R4.1 upgrade (and maybe some future too?), as the process uses --downloadonly option internally. QubesOS/qubes-issues#5685 (cherry picked from commit 001859701865f5c4598cd46a6c30086c7be7368d) --- dom0-updates/qubes-dom0-update | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dom0-updates/qubes-dom0-update b/dom0-updates/qubes-dom0-update index 3412a636..510ab720 100755 --- a/dom0-updates/qubes-dom0-update +++ b/dom0-updates/qubes-dom0-update @@ -64,6 +64,10 @@ while [ $# -gt 0 ]; do --disablerepo=*) UPDATEVM_OPTS+=( "$1" ) ;; + --downloadonly) + YUM_OPTS+=( "${1}" ) + QVMTEMPLATE_OPTS+=( "$1" ) + ;; --clean) CLEAN=1 UPDATEVM_OPTS+=( "$1" )