From 4cdcc4bcf4ffbca300191150e86b1b50fe3278a7 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Thu, 17 Sep 2009 13:02:47 +0000
Subject:  Handle virtio

---
 perl-install/Makefile.config   | 2 +-
 perl-install/NEWS              | 3 +++
 perl-install/detect_devices.pm | 9 ++++++++-
 perl-install/install/NEWS      | 3 +++
 4 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 2fa42bfff..0fb48a342 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
 # -*- Makefile -*-
-VERSION:=11.71.9
+VERSION:=11.71.10
 
 SUDO        = sudo
 TMPDIR      = /tmp
diff --git a/perl-install/NEWS b/perl-install/NEWS
index a18a1a77f..a0edf7779 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,8 @@
+Version 11.71.10 - 17 September 2009
+
 - drakhelp:
   o fix firefox launch bug #29775
+- handle virtio devices
 
 Version 11.71.9 - 27 April 2009
 
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 3e057d28f..a4cc3d05d 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -32,7 +32,7 @@ sub get() {
     #- 2. The first SCSI device if SCSI exists. Or
     #- 3. The first RAID device if RAID exists.
 
-    getIDE(), getSCSI(), getDAC960(), getCompaqSmartArray(), getATARAID();
+    getIDE(), getSCSI(), getVirtIO(), getDAC960(), getCompaqSmartArray(), getATARAID();
 }
 sub hds()         { grep { may_be_a_hd($_) } get() }
 sub tapes()       { grep { $_->{media_type} eq 'tape' } get() }
@@ -366,6 +366,13 @@ sub getATARAID() {
     values %l;
 }
 
+sub getVirtIO() {
+    -d '/sys/bus/virtio/devices' or return;
+    map {
+            { device => basename($_), info => "VirtIO block device", media_type => 'hd', bus => 'virtio' }
+    }
+    glob("/sys/bus/virtio/devices/*/block/*");
+}
 
 # cpu_name : arch() =~ /^alpha/ ? "cpu	" :
 # arch() =~ /^ppc/ ? "processor" : "vendor_id"
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index ef8511762..a6e70aaea 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,8 +1,11 @@
+Version 11.71.10 - 17 September 2009
+
 - do allow to upgrade Mandrakelinux (regression introduced in 10.14)
 - handle new driver:
   o network: et131x, smsc95xx
 - fix detecting SMP (was broken we relied on install kernel being non-smp) (#44825)
 - fix reading compssUsers.pl if rpmsrate is forced (for example with drakx-in-chroot)
+- handle virtio devices
 
 Version 11.69 - 11 October 2008
 
-- 
cgit v1.2.1