Install grub2-xen-pvh via sdw-admin - dnf can't resolve/install new r…

…equirements in dom0

files/sdw-admin.py

@@ -62,6 +62,17 @@ def parse_args():
     return args
 
 
+def install__pvh_support()
+    """
+    Installs grub2-xen-pvh in dom0 - required for PVH with AppVM local kernels
+    TODO: install this via package requirements instead if possible
+    """
+    try:
+        subprocess.run(["sudo", "qubes-dom0-update", "-y", "-q", "grub2-xen-pvh"])
+    except subprocess.CalledProcessError:
+        raise SDWAdminException("Error installing grub2-xen-pvah: local PVH not available.")
+
+
 def copy_config():
     """
     Copies config.json and sd-journalist.sec to /srv/salt/sd
@@ -176,6 +187,7 @@ def main():
                 sys.exit(0)
         print("Applying configuration...")
         validate_config(SCRIPTS_PATH)
+        install_pvh_support()
         copy_config()
         refresh_salt()
         provision_all()

rpm-build/SPECS/securedrop-workstation-dom0-config.spec

@@ -33,7 +33,6 @@ BuildRequires:	python3-wheel
 # This package installs all standard VMs in Qubes
 Requires:		qubes-mgmt-salt-dom0-virtual-machines
 Requires:		python3-qt5
-Requires:               grub2-xen-pvh
 
 %description
 This package contains VM configuration files for the Qubes-based