From 8582508256cbd9e44d7acfdbf9ac2f9dc6fedfdd Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 3 Dec 2013 09:39:24 +0100
Subject: detect eMMc block devices (Luc Menut, mga#11812)

---
 perl-install/NEWS              |  3 +++
 perl-install/detect_devices.pm | 10 +++++++++-
 perl-install/install/NEWS      |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index d061e574d..21a48e73b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+  o detect eMMc block devices (Luc Menut, mga#11812)
+
 Version 16.4 - 2 December 2013
 
 - fix banners not being blue anymore with Oxygen-gtk theme (kbo#328270)
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 6f70c92d2..184a1db31 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -33,7 +33,7 @@ sub get() {
     #- 2. The first SCSI device if SCSI exists. Or
     #- 3. The first RAID device if RAID exists.
 
-    getIDE(), getSCSI(), getXenBlk(), getVirtIO(), getDAC960(), getCompaqSmartArray(), getATARAID();
+    getIDE(), getSCSI(), getMmcBlk(), getXenBlk(), getVirtIO(), getDAC960(), getCompaqSmartArray(), getATARAID();
 }
 sub hds()         { grep { may_be_a_hd($_) } get() }
 sub tapes()       { grep { $_->{media_type} eq 'tape' } get() }
@@ -401,6 +401,14 @@ sub getVirtIO() {
     glob("/sys/bus/virtio/devices/*/block/*");
 }
 
+sub getMmcBlk() {
+    -d '/sys/bus/mmc/devices' or return;
+    map {
+            { device => basename($_), info => "MMC block device", media_type => 'hd', bus => 'mmc' };
+    }
+    glob("/sys/bus/mmc/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 fff8a7d7d..d669de58a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- partitioning:
+  o detect eMMc block devices (Luc Menut, mga#11812)
+
 Version 16.4 - 2 December 2013
 
 - fix partitioning wizard moving the main window to left (mga#11790)
-- 
cgit v1.2.1