From 4e73aa0a0927c4a759cace2cf75a350b38aa93a4 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 21 May 2017 14:37:55 -0400
Subject: more robust version comparison

a version of kvm like 2.4.10 would have claimed to be greater than
2.6.0 using the existing comparison.  we'll rely on dpkg's
implementation of version comparisons instead.

this does make kvm-manager more specific to debian and debian-derived
systems, but if folks who prefer other systems want to offer patches,
they would be happily accepted :)
---
 kvm-manager | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kvm-manager b/kvm-manager
index 1747a38..0e15c09 100755
--- a/kvm-manager
+++ b/kvm-manager
@@ -51,7 +51,7 @@ BRIDGE="${BRIDGE:-br0}"
 OWNERGROUP=$(groups "$OWNER" | cut -f1 -d\  )
 OWNERHOME=$(getent passwd "$OWNER" | cut -f6 -d: )
 
-kvm_version=$(kvm --version | head -n1 | sed -E 's/QEMU emulator version ([0-9.]+).*/\1/' | tr -d '.')
+kvm_version=$(kvm --version | head -n1 | sed -E 's/^QEMU emulator version ([0-9.]+).*/\1/')
 
 # Disks can be HDA, HDB, HDC, etc. For each disk, we want to detect the
 # corresponding environment variables for disk read/write restrictions
@@ -62,7 +62,7 @@ build_disk_io_params() {
   local option variable argument value
   disk_io_params=
 
-  if [ "$kvm_version" -lt "260" ]; then
+  if dpkg --compare-versions "$kvm_version" lt 2.6.0; then
     # Only supported in version 2.6.0 or above.
     return
   fi
-- 
cgit v1.2.3