From 47036a271683076162909c062e1d22d6e8d8de06 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Fri, 23 Jan 2015 23:38:17 +0100
Subject: fix device detection in generic LuminaOS-Linux

---
 libLumina/LuminaOS-Linux.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'libLumina')

diff --git a/libLumina/LuminaOS-Linux.cpp b/libLumina/LuminaOS-Linux.cpp
index acece864..aaf781fb 100644
--- a/libLumina/LuminaOS-Linux.cpp
+++ b/libLumina/LuminaOS-Linux.cpp
@@ -30,14 +30,16 @@ QStringList LOS::ExternalDevicePaths(){
   //Now check the output
   for(int i=0; i<devs.length(); i++){
     if(devs[i].startsWith("/dev/")){
-      QString type = devs[i].section(" on ",0,0);
-        type.remove("/dev/");
+      devs[i] = devs[i].simplified();
+      QString type = devs[i].section(" ",0,0);
+      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(" ",4,4)+"::::"+devs[i].section(" ",2,2);
     }else{
       //invalid device - remove it from the list
       devs.removeAt(i);
-- 
cgit