[spice-vdagent/el5] Load virtio_console from the initscript as it does not autoload on EL5

Hans de Goede jwrdegoede at fedoraproject.org
Fri Jan 20 20:16:58 UTC 2012


commit 4a26aa50ec1f58e397f967b5a2cc8f75313d80b3
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Jan 20 21:18:05 2012 +0100

    Load virtio_console from the initscript as it does not autoload on EL5

 spice-vdagent-0.8.1-virtio_console.patch |   11 +++++++++++
 spice-vdagent.spec                       |    8 +++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/spice-vdagent-0.8.1-virtio_console.patch b/spice-vdagent-0.8.1-virtio_console.patch
new file mode 100644
index 0000000..d25d60d
--- /dev/null
+++ b/spice-vdagent-0.8.1-virtio_console.patch
@@ -0,0 +1,11 @@
+diff -up spice-vdagent-0.8.1/data/spice-vdagentd~ spice-vdagent-0.8.1/data/spice-vdagentd
+--- spice-vdagent-0.8.1/data/spice-vdagentd~	2011-04-18 20:21:34.000000000 +0200
++++ spice-vdagent-0.8.1/data/spice-vdagentd	2012-01-20 17:45:46.668344851 +0100
+@@ -35,6 +35,7 @@ lockfile=/var/lock/subsys/$prog
+ 
+ start() {
+     [ -x $exec ] || exit 5
++    modprobe virtio_console > /dev/null 2>&1 && sleep .2
+     [ -c $port ] || exit 0
+     modprobe uinput > /dev/null 2>&1
+     # In case the previous running vdagentd crashed
diff --git a/spice-vdagent.spec b/spice-vdagent.spec
index 09d6d3c..7461c43 100644
--- a/spice-vdagent.spec
+++ b/spice-vdagent.spec
@@ -1,6 +1,6 @@
 Name:           spice-vdagent
 Version:        0.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Agent for Spice guests
 Group:          Applications/System
 License:        GPLv3+
@@ -23,6 +23,8 @@ Patch12:        0012-vdagentd-Close-the-virtio-port-when-the-active-vdage.patch
 Patch13:        0013-Add-a-RHEL-5-README-and-xorg.conf-example-file.patch
 # HACK: there is no spice-protocol in the el5 build repository
 Patch14:        spice-vdagent-0.8.1-no-spice-protocol.patch
+# EPEL5 only patch virtio_console does not get autoloaded on EL5
+Patch15:        spice-vdagent-0.8.1-virtio_console.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libpciaccess-devel dbus-devel libXrender-devel
 BuildRequires:  libXrandr-devel libXinerama-devel libXfixes-devel libtool
@@ -63,6 +65,7 @@ After installation  please see README.RHEL-5 for some RHEL-5 specific notes!
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 autoreconf -f -i
 
 
@@ -109,6 +112,9 @@ fi
 
 
 %changelog
+* Fri Jan 20 2012 Hans de Goede <hdegoede at redhat.com> - 0.8.1-3
+- Load virtio_console from the initscript as it does not autoload on EL5
+
 * Wed Jan 11 2012 Hans de Goede <hdegoede at redhat.com> - 0.8.1-2
 - Also build for i386
 


More information about the scm-commits mailing list