summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-30 23:29:11 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-30 23:29:11 +0000
commitefa40844505ccd620015ab5f2f4b969cc0405ee7 (patch)
tree68e3910a25650a8c16e1e5369539089b4c1996fc
parent1df7bb225bed9326040417e8185746dc226854a7 (diff)
downloaddrakx-efa40844505ccd620015ab5f2f4b969cc0405ee7.tar
drakx-efa40844505ccd620015ab5f2f4b969cc0405ee7.tar.gz
drakx-efa40844505ccd620015ab5f2f4b969cc0405ee7.tar.bz2
drakx-efa40844505ccd620015ab5f2f4b969cc0405ee7.tar.xz
drakx-efa40844505ccd620015ab5f2f4b969cc0405ee7.zip
fix detecting Xen hard disks (mga#9546)
issue "introduced" in commit r4655 on May 23 2012: "add support for XenBlk discs(...) needs testing"
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/detect_devices.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 882d996b0..001da6edb 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- fix detecting Xen hard disks (mga#9546)
+
Version 15.31 - 21 March 2013
- do not show notification bubble in net_applet as they make it to
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 54d0f7bec..e9165471f 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -389,7 +389,7 @@ sub getXenBlk() {
-d '/sys/bus/xen/devices' or return;
map {
s/block://;
- { device => basename($_), info => "Xen block device", media_type => 'xvd', bus => 'xen' };
+ { device => basename($_), info => "Xen block device", media_type => 'hd', bus => 'xen' };
} glob("/sys/bus/xen/devices/*/block*");
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index fd5864267..92f9b1445 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix detecting Xen hard disks (mga#9546)
+
Version 15.31 - 25 March 2013
- recognize more webcam & bluetooth devices (might help mga#5841)