From 6254f8748e03bebadff1ac0e5d51c5943f6057d8 Mon Sep 17 00:00:00 2001
From: Katerina Koukiou <kkoukiou@redhat.com>
Date: Thu, 24 Jun 2021 11:17:08 +0200
Subject: [PATCH] Sync 247-1 from Fedora Rawhide

Resolves: rhbz#1973102
Resolves: rhbz#1973122
Resolves: rhbz#1974200
Resolves: rhbz#1974228
Resolves: rhbz#1977551
Resolves: rhbz#1977669
Resolves: rhbz#1977810
Resolves: rhbz#1974216
Resolves: rhbz#1977554
Resolves: rhbz#1978206
Resolves: rhbz#1947241
---
 .gitignore            |  1 +
 cockpit-machines.spec | 10 +++++++---
 plans/upstream.fmf    |  2 +-
 sources               |  2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7cbd89c..139ff6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /cockpit-machines-243.tar.gz
 /cockpit-machines-243.1.tar.gz
 /cockpit-machines-244.1.tar.gz
+/cockpit-machines-247.tar.gz
diff --git a/cockpit-machines.spec b/cockpit-machines.spec
index 178018c..44205d2 100644
--- a/cockpit-machines.spec
+++ b/cockpit-machines.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        244.1
+Version:        247
 Release: 1%{?dist}
 #
 # Copyright (C) 2021 Red Hat, Inc.
@@ -17,7 +17,6 @@ Release: 1%{?dist}
 # You should have received a copy of the GNU Lesser General Public License
 # along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
 #
-
 Name:           cockpit-machines
 Summary:        Cockpit user interface for virtual machines
 License:        LGPLv2+ and MIT
@@ -58,12 +57,17 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*
 
 %files
 %doc README.md
-%license LICENSE dist/index.js.LICENSE.txt
+%license LICENSE dist/index.js.LICENSE.txt.gz
 %{_datadir}/cockpit/*
 %{_datadir}/metainfo/*
 
 # The changelog is automatically generated and merged
 %changelog
+* Thu July 09 2021 Katerina Koukiou <kkoukiou@redhat.com> - 247-1
+
+- Machines: Share host files with the guest using virtiofs
+- Machines: Show list of pass-through devices
+
 * Mon May 17 2021 Katerina Koukiou <kkoukiou@redhat.com> - 244.1-1
 
 - Edit the MAC address of a VM’s network interface
diff --git a/plans/upstream.fmf b/plans/upstream.fmf
index ed8fa34..19d5a42 100644
--- a/plans/upstream.fmf
+++ b/plans/upstream.fmf
@@ -2,6 +2,6 @@ discover:
   how: fmf
   repository: https://github.com/cockpit-project/cockpit-machines
   # FIXME: get rid of the hardcoding: https://github.com/psss/tmt/issues/585
-  ref: "4bae1d78303875f04b57cbb5cc7c6f40a6868fe8"
+  ref: "11ecadd6553c3bbee03a6aa71fb2acf0042f0e1a"
 execute:
   how: tmt
diff --git a/sources b/sources
index d885999..f0f96d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-machines-244.1.tar.gz) = e6d24dfe9abdfc0704160fe9c0dd0ae326986b0f69e824a0126f8d5f0d1a22b0fc4cd25907285be105a0a1d60936e5e47fd03cf8ba1a7a247a6424dea3bcc2c7
+SHA512 (cockpit-machines-247.tar.gz) = d0e2b18de39d8ab44937c2e76343eb6dbaa92d7ba9766fd5974f4a3a0903dec80da44425525d671bb94ebbe7ae20e18d24ca5e3044f0fbadbd555ad1593fa991