Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
05caeb9d41 | ||
|
|
0df55d3243 |
4 changed files with 95 additions and 5 deletions
25
0001-initrdinject-Use-full-option-versions-for-cpio.patch
Normal file
25
0001-initrdinject-Use-full-option-versions-for-cpio.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
From: Cole Robinson <crobinso@redhat.com>
|
||||
Date: Tue, 2 Apr 2019 15:02:47 -0400
|
||||
Subject: [PATCH virt-manager] initrdinject: Use full option versions for cpio
|
||||
|
||||
Makes it more self documenting IMO
|
||||
|
||||
(cherry picked from commit 309840b9535b0e1965ed177b4558652faa256b36)
|
||||
---
|
||||
virtinst/initrdinject.py | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/virtinst/initrdinject.py b/virtinst/initrdinject.py
|
||||
index 78c18c28..9a09f20c 100644
|
||||
--- a/virtinst/initrdinject.py
|
||||
+++ b/virtinst/initrdinject.py
|
||||
@@ -30,7 +30,8 @@ def perform_initrd_injections(initrd, injections, scratchdir):
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
cwd=tempdir)
|
||||
- cpio_proc = subprocess.Popen(['cpio', '-o', '--null', '-Hnewc', '--quiet'],
|
||||
+ cpio_proc = subprocess.Popen(['cpio', '--create', '--null', '--quiet',
|
||||
+ '--format=newc'],
|
||||
stdin=find_proc.stdout,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
From: Cole Robinson <crobinso@redhat.com>
|
||||
Date: Wed, 3 Apr 2019 18:07:12 -0400
|
||||
Subject: [PATCH virt-manager] initrdinject: Force added files to be owned as
|
||||
root (bz 1686464)
|
||||
|
||||
systemd in fedora30 has some new security restriction about non-root
|
||||
owned directories. Initrd inject would tickle this because the cpio
|
||||
archive would cause the root dir in the initrd to be owned by the
|
||||
uid that launched virt-install.
|
||||
|
||||
Pass --owner=+0:+0 to cpio to force root ownership
|
||||
|
||||
Suggested-by: James Szinger <jszinger@gmail.com>
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1686464
|
||||
(cherry picked from commit c6b5f22fa61d87557b5fab23be080073d2f7906e)
|
||||
---
|
||||
virtinst/initrdinject.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/virtinst/initrdinject.py b/virtinst/initrdinject.py
|
||||
index 9a09f20c..4032f9ba 100644
|
||||
--- a/virtinst/initrdinject.py
|
||||
+++ b/virtinst/initrdinject.py
|
||||
@@ -31,7 +31,7 @@ def perform_initrd_injections(initrd, injections, scratchdir):
|
||||
stderr=subprocess.PIPE,
|
||||
cwd=tempdir)
|
||||
cpio_proc = subprocess.Popen(['cpio', '--create', '--null', '--quiet',
|
||||
- '--format=newc'],
|
||||
+ '--format=newc', '--owner=+0:+0'],
|
||||
stdin=find_proc.stdout,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (virt-manager-2.0.0.tar.gz) = 5d0eb65dceb5c913973edaa52414b1665d1ed9cd3f226e28a592decddec2acd8fdb589f60736edf9b7d95830893812f9aecca2cbdd715033ca7ea53a95472876
|
||||
SHA512 (virt-manager-2.1.0.tar.gz) = 48590ff58246e13b73c7ab741ca854bfebae27fb90a891168db5d3fac1d066cce603f83b8d993e70e387624f911fc8503abe488e7992bc50f49d7e980aed5afb
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
# This package depends on automagic byte compilation
|
||||
# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
|
||||
%global _python_bytecompile_extra 1
|
||||
|
||||
# -*- rpm-spec -*-
|
||||
|
||||
# RPM doesn't detect that code in /usr/share is python3, this forces it
|
||||
|
|
@ -12,17 +16,20 @@
|
|||
# End local config
|
||||
|
||||
Name: virt-manager
|
||||
Version: 2.0.0
|
||||
Release: 1%{?dist}
|
||||
Version: 2.1.0
|
||||
Release: 2%{?dist}
|
||||
%global verrel %{version}-%{release}
|
||||
|
||||
Summary: Desktop tool for managing virtual machines via libvirt
|
||||
Group: Applications/Emulators
|
||||
License: GPLv2+
|
||||
BuildArch: noarch
|
||||
URL: https://virt-manager.org/
|
||||
Source0: https://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
|
||||
|
||||
# Fix --initrd-inject with f30 URLs (bz #1686464)
|
||||
Patch0001: 0001-initrdinject-Use-full-option-versions-for-cpio.patch
|
||||
Patch0002: 0002-initrdinject-Force-added-files-to-be-owned-as-root-b.patch
|
||||
|
||||
|
||||
Requires: virt-manager-common = %{verrel}
|
||||
Requires: python3-gobject
|
||||
|
|
@ -64,8 +71,8 @@ management API.
|
|||
|
||||
%package common
|
||||
Summary: Common files used by the different Virtual Machine Manager interfaces
|
||||
Group: Applications/Emulators
|
||||
|
||||
Requires: python3-argcomplete
|
||||
Requires: python3-libvirt
|
||||
Requires: python3-libxml2
|
||||
Requires: python3-requests
|
||||
|
|
@ -101,6 +108,10 @@ machine).
|
|||
%prep
|
||||
%setup -q
|
||||
|
||||
# Fix --initrd-inject with f30 URLs (bz #1686464)
|
||||
%patch0001 -p1
|
||||
%patch0002 -p1
|
||||
|
||||
|
||||
%build
|
||||
%if %{default_hvs}
|
||||
|
|
@ -162,6 +173,11 @@ done
|
|||
%{_datadir}/%{name}/virt-convert
|
||||
%{_datadir}/%{name}/virt-xml
|
||||
|
||||
%{_datadir}/bash-completion/completions/virt-install
|
||||
%{_datadir}/bash-completion/completions/virt-clone
|
||||
%{_datadir}/bash-completion/completions/virt-convert
|
||||
%{_datadir}/bash-completion/completions/virt-xml
|
||||
|
||||
%{_bindir}/virt-install
|
||||
%{_bindir}/virt-clone
|
||||
%{_bindir}/virt-convert
|
||||
|
|
@ -169,6 +185,22 @@ done
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Apr 03 2019 Cole Robinson <crobinso@redhat.com> - 2.1.0-2
|
||||
- Fix --initrd-inject with f30 URLs (bz #1686464)
|
||||
|
||||
* Sun Feb 03 2019 Cole Robinson <crobinso@redhat.com> - 2.1.0-1
|
||||
- Rebased to version 2.1.0
|
||||
- Bash autocompletion support (Lin Ma, Cole Robinson)
|
||||
- UI and command line --vsock support (Slavomir Kaslev)
|
||||
- virt-xml: Add --os-variant option (Andrea Bolognani)
|
||||
- virt-install: use libosinfo cpu, mem, disk size defaults (Fabiano
|
||||
Fidencio)
|
||||
- virt-install: Better usage of libosinfo -unknown distro IDs (Fabiano
|
||||
Fidencio)
|
||||
- virt-install: More usage of libosinfo for ISO --location detection
|
||||
- virt-install: Add --location LOCATION,kernel=X,initrd=Y for pointing to
|
||||
kernel/initrd in media that virt-install/libosinfo fails to detect
|
||||
|
||||
* Mon Oct 15 2018 Cole Robinson <crobinso@redhat.com> - 2.0.0-1
|
||||
- Rebased to version 2.0.0
|
||||
- Finish port to Python 3
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue