New upstream version 1.15.
- Remove patches, now upstream.
This commit is contained in:
parent
15b295c0a6
commit
2ef57b434e
@ -1,72 +0,0 @@
|
|||||||
From d409914d13b88541402fe871d70e3dff9d738455 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
|
|
||||||
Date: Mon, 2 Sep 2013 15:24:11 +0100
|
|
||||||
Subject: [PATCH 1/2] Differentiate between vserver host and guest.
|
|
||||||
|
|
||||||
RWMJ: Update documentation and tests.
|
|
||||||
---
|
|
||||||
tests/test-linux-vserver.sh | 3 ++-
|
|
||||||
virt-what.in | 5 +++++
|
|
||||||
virt-what.pod | 12 ++++++++++++
|
|
||||||
3 files changed, 19 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/tests/test-linux-vserver.sh b/tests/test-linux-vserver.sh
|
|
||||||
index 40d75a5..7988f81 100755
|
|
||||||
--- a/tests/test-linux-vserver.sh
|
|
||||||
+++ b/tests/test-linux-vserver.sh
|
|
||||||
@@ -19,7 +19,8 @@
|
|
||||||
root=tests/linux-vserver
|
|
||||||
|
|
||||||
output="$(./virt-what --test-root=$root 2>&1)"
|
|
||||||
-expected="linux_vserver"
|
|
||||||
+expected="linux_vserver
|
|
||||||
+linux_vserver-guest"
|
|
||||||
|
|
||||||
if [ "$output" != "$expected" ]; then
|
|
||||||
echo "$0: test failed because output did not match expected"
|
|
||||||
diff --git a/virt-what.in b/virt-what.in
|
|
||||||
index f12c95b..422f6d0 100644
|
|
||||||
--- a/virt-what.in
|
|
||||||
+++ b/virt-what.in
|
|
||||||
@@ -147,6 +147,11 @@ fi
|
|
||||||
# Check for Linux-VServer
|
|
||||||
if cat "${root}/proc/self/status" | grep -q "VxID: [0-9]*"; then
|
|
||||||
echo linux_vserver
|
|
||||||
+ if grep -q "VxID: 0$" "${root}/proc/self/status"; then
|
|
||||||
+ echo linux_vserver-host
|
|
||||||
+ else
|
|
||||||
+ echo linux_vserver-guest
|
|
||||||
+ fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for UML.
|
|
||||||
diff --git a/virt-what.pod b/virt-what.pod
|
|
||||||
index 98cd4af..bff2998 100644
|
|
||||||
--- a/virt-what.pod
|
|
||||||
+++ b/virt-what.pod
|
|
||||||
@@ -62,10 +62,22 @@ Status: confirmed by RWMJ using a Fedora guest running in z/VM
|
|
||||||
|
|
||||||
=item B<linux_vserver>
|
|
||||||
|
|
||||||
+This is printed for backwards compatibility with older virt-what which
|
|
||||||
+could not distinguish between a Linux VServer container guest and
|
|
||||||
+host.
|
|
||||||
+
|
|
||||||
+=item B<linux_vserver-guest>
|
|
||||||
+
|
|
||||||
This process is running in a Linux VServer container.
|
|
||||||
|
|
||||||
Status: contributed by Barış Metin
|
|
||||||
|
|
||||||
+=item B<linux_vserver-host>
|
|
||||||
+
|
|
||||||
+This process is running as the Linux VServer host (VxID 0).
|
|
||||||
+
|
|
||||||
+Status: contributed by Barış Metin and Elan Ruusamäe
|
|
||||||
+
|
|
||||||
=item B<lxc>
|
|
||||||
|
|
||||||
This process is running in a Linux LXC container.
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
|||||||
From 8709c0e87dc3124b1a64d85654d6d4904702d767 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
||||||
Date: Mon, 28 Oct 2013 11:09:24 +0000
|
|
||||||
Subject: [PATCH] xen: Don't emit warning message if /proc/xen/capabilities
|
|
||||||
file does not exist.
|
|
||||||
|
|
||||||
On Amazon EC2:
|
|
||||||
|
|
||||||
xen
|
|
||||||
grep: /proc/xen/capabilities: No such file or directory
|
|
||||||
xen-domU
|
|
||||||
|
|
||||||
The warning is harmless but should not be printed.
|
|
||||||
|
|
||||||
Thanks: Can Zhang for testing.
|
|
||||||
---
|
|
||||||
virt-what.in | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/virt-what.in b/virt-what.in
|
|
||||||
index bf663aa..4b6d3b8 100644
|
|
||||||
--- a/virt-what.in
|
|
||||||
+++ b/virt-what.in
|
|
||||||
@@ -199,7 +199,7 @@ if [ "$cpuid" = "XenVMMXenVMM" ]; then
|
|
||||||
skip_qemu_kvm=true
|
|
||||||
elif [ -d "${root}/proc/xen" ]; then
|
|
||||||
echo xen
|
|
||||||
- if grep -q "control_d" "${root}/proc/xen/capabilities"; then
|
|
||||||
+ if grep -q "control_d" "${root}/proc/xen/capabilities" 2>/dev/null; then
|
|
||||||
echo xen-dom0
|
|
||||||
else
|
|
||||||
echo xen-domU
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
|||||||
From acd6bec92a99550ad98011d44f6381fdf7fa5992 Mon Sep 17 00:00:00 2001
|
|
||||||
From: nodata <lsof@nodata.co.uk>
|
|
||||||
Date: Mon, 2 Sep 2013 16:59:32 +0100
|
|
||||||
Subject: [PATCH 2/2] Detect new Xen VMs (RHBZ#973663).
|
|
||||||
|
|
||||||
---
|
|
||||||
virt-what.in | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/virt-what.in b/virt-what.in
|
|
||||||
index 422f6d0..bf663aa 100644
|
|
||||||
--- a/virt-what.in
|
|
||||||
+++ b/virt-what.in
|
|
||||||
@@ -197,7 +197,7 @@ fi
|
|
||||||
if [ "$cpuid" = "XenVMMXenVMM" ]; then
|
|
||||||
echo xen; echo xen-hvm
|
|
||||||
skip_qemu_kvm=true
|
|
||||||
-elif [ -f "${root}/proc/xen/capabilities" ]; then
|
|
||||||
+elif [ -d "${root}/proc/xen" ]; then
|
|
||||||
echo xen
|
|
||||||
if grep -q "control_d" "${root}/proc/xen/capabilities"; then
|
|
||||||
echo xen-dom0
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
@ -1,16 +1,12 @@
|
|||||||
Name: virt-what
|
Name: virt-what
|
||||||
Version: 1.13
|
Version: 1.15
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Detect if we are running in a virtual machine
|
Summary: Detect if we are running in a virtual machine
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
|
|
||||||
URL: http://people.redhat.com/~rjones/virt-what/
|
URL: http://people.redhat.com/~rjones/virt-what/
|
||||||
Source0: http://people.redhat.com/~rjones/virt-what/files/%{name}-%{version}.tar.gz
|
Source0: http://people.redhat.com/~rjones/virt-what/files/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
Patch1: 0001-Differentiate-between-vserver-host-and-guest.patch
|
|
||||||
Patch2: 0002-Detect-new-Xen-VMs-RHBZ-973663.patch
|
|
||||||
Patch3: 0001-xen-Don-t-emit-warning-message-if-proc-xen-capabilit.patch
|
|
||||||
|
|
||||||
# This is provided by the build root, but we make it explicit
|
# This is provided by the build root, but we make it explicit
|
||||||
# anyway in case this was dropped from the build root in future.
|
# anyway in case this was dropped from the build root in future.
|
||||||
BuildRequires: /usr/bin/pod2man
|
BuildRequires: /usr/bin/pod2man
|
||||||
@ -59,10 +55,6 @@ Current types of virtualization detected:
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%patch1 -p1
|
|
||||||
%patch2 -p1
|
|
||||||
%patch3 -p1
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
@ -85,6 +77,10 @@ make check
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 21 2015 Richard W.M. Jones <rjones@redhat.com> - 1.15-1
|
||||||
|
- New upstream version 1.15.
|
||||||
|
- Remove patches, now upstream.
|
||||||
|
|
||||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-5
|
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user