Merge branch 'xen-rc'

* xen-rc: dom0-update: fix handling -rc xen version
QubesOS · Nov 29, 2022 · cb44e8a · cb44e8a
2 parents 76900c2 + 02d29b4
commit cb44e8a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/dom0-updates/qubes-dom0-update b/dom0-updates/qubes-dom0-update
@@ -305,6 +305,8 @@ if [ -f /var/lib/qubes/updates/repodata/repomd.xml ]; then
         |cut -f 1,2 -d . \
         |uniq)
     xen_running=$(xl info xen_version|cut -f 1,2 -d .)
+    # cut off -rc if any
+    xen_running=${xen_running%-*}
     if [ -n "$xen_in_update" ] && [ "$xen_in_update" != "$xen_running" ]; then
         # check if there are running VMs
         if [ "$(xl list|wc -l)" -gt 2 ]; then