From 4595605bbd24197602b33df75791d095200f54bd Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Fri, 23 Jan 2015 23:30:38 +0100
Subject: fixup device detection in LuminaOS-Debian

---
 libLumina/LuminaOS-Debian.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libLumina/LuminaOS-Debian.cpp b/libLumina/LuminaOS-Debian.cpp
index 313e2ae3..0ba367e2 100644
--- a/libLumina/LuminaOS-Debian.cpp
+++ b/libLumina/LuminaOS-Debian.cpp
@@ -33,14 +33,16 @@ QStringList LOS::ExternalDevicePaths(){
   //Now check the output
   for(int i=0; i<devs.length(); i++){
     if(devs[i].startsWith("/dev/")){
+      devs[i] = devs[i].simplified();
       QString type = devs[i].section(" on ",0,0);
-        type.remove("/dev/");
+      type.remove("/dev/");
       //Determine the type of hardware device based on the dev node
       if(type.startsWith("sd")){ type = "HDRIVE"; }
       else if(type.startsWith("sr")){ type="DVD"; }
+      else if(type.contains("mapper")){ type="LVM"; }
       else{ type = "UNKNOWN"; }
       //Now put the device in the proper output format
-      devs[i] = type+"::::"+devs[i].section("(",1,1).section(",",0,0)+"::::"+devs[i].section(" on ",1,50).section("(",0,0).simplified();
+      devs[i] = type + "::::" + devs[i].section(" ",1,1) + "::::" + devs[i].section(" ",2,2);
     }else{
       //invalid device - remove it from the list
       devs.removeAt(i);
-- 
cgit