From 690e10ffd4e12e6d468f19f3c301496735839ab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 13 May 2015 02:33:12 +0200
Subject: [PATCH] dom0-update: prevent template package upgrades (#996)

This would override user changes to the template. Previous method
(Obsoletes: rpm header) doesn't work now, so add explicit exclude list
as yum option

Fixes qubesos/qubes-issues#996

(cherry picked from commit 4cab8153174318cb082cb168e030d984326df794)

Conflicts:
	dom0-updates/qubes-dom0-update
---
 dom0-updates/qubes-dom0-update | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dom0-updates/qubes-dom0-update b/dom0-updates/qubes-dom0-update
index 8ba238a..12b1b04 100755
--- a/dom0-updates/qubes-dom0-update
+++ b/dom0-updates/qubes-dom0-update
@@ -21,11 +21,13 @@ if [ "$1" = "--help" ]; then
     exit
 fi
 
+# Prevent template upgrade - this would override user changes
+TEMPLATE_EXCLUDE_OPTS="--exclude=`rpm -qa --qf '%{NAME},' qubes-template-\*`"
 PKGS=
-YUM_OPTS=
+YUM_OPTS="$TEMPLATE_EXCLUDE_OPTS"
 GUI=
 CHECK_ONLY=
-ALL_OPTS=$*
+ALL_OPTS="$TEMPLATE_EXCLUDE_OPTS $*"
 QVMRUN_OPTS=
 CLEAN=
 # Filter out some yum options and collect packages list