From 2da99f43934d8accbddfe6c8ae79cd343f0ea1a5 Mon Sep 17 00:00:00 2001
From: inxi-svn <inxi-svn@techpatterns.com>
Date: Wed, 4 Feb 2009 23:52:46 +0000
Subject: [PATCH] branches/one arch / debugging

---
 inxi | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/inxi b/inxi
index 82f7368..8644201 100755
--- a/inxi
+++ b/inxi
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################
 ####  Script Name: inxi
-####  version: 0.9.10-b1-t2
+####  version: 0.9.10-b1-t3
 ####  Date: 4 February 2009
 ########################################################################
 ####  SPECIAL THANKS
@@ -2401,15 +2401,15 @@ get_partition_data_advanced()
 					}
 					# handle Arch /dev/root for / id
 					if ( partition == "root" ) {
-						partTemp='$(readlink /dev/root)'
+						partTemp="'$( readlink /dev/root )'"
 						if ( partTemp ~ /^[hs]d[a-z][0-9]+$/ ) {
 							partition=partTemp
 						}
 						else if ( partTemp ~ /[a-z]+-[a-z]+-[a-z]+/ ) {
-							uuid=partTemp
+							uuid=gensub( /^(\/dev\/disk\/by-uuid\/)(.+)$/, "\\2", 1, partTemp )
 						}
 						else if ( partTemp != "" ) {
-							label=partTemp
+							label=gensub( /^(\/dev\/disk\/by-label\/)(.+)$/, "\\2", 1, partTemp )
 						}
 					}
 					print partition "," label "," uuid
@@ -2466,11 +2466,6 @@ get_partition_data_advanced()
 	fi
 # 	echo 'A_PARTITION_DATA: ' "${A_PARTITION_DATA[@]}"
 }
-# $1 - mount point
-get_partition_full_data()
-{
-	:
-}
 
 ## return uptime string
 get_uptime()