From 83878c2fa826ae9083257e2e3faa8b488d170ba8 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Thu, 5 Feb 2009 00:59:38 +0000 Subject: [PATCH] arch root fix --- inxi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/inxi b/inxi index fdb130b..459f692 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 0.9.10-b1-t5 +#### version: 0.9.10-b1-t6 #### Date: 4 February 2009 ######################################################################## #### SPECIAL THANKS @@ -2398,15 +2398,17 @@ get_partition_data_advanced() } # handle Arch /dev/root for / id +# partition="root" if ( partition == "root" ) { partTemp="'$( readlink /dev/root 2>/dev/null )'" +# partTemp="/dev/disk/by-uuid/7b67bf1e-626d-43d2-9885-1d1bbae26809" if ( partTemp ~ /^[hs]d[a-z][0-9]+$/ ) { partition=partTemp } - else if ( partTemp ~ /[a-z]+-[a-z]+-[a-z]+/ ) { + else if ( partTemp ~ /by-uuid\/[a-z0-9]+-[a-z0-9]+-[a-z0-9]+/ ) { uuid=gensub( /^(\/dev\/disk\/by-uuid\/)(.+)$/, "\\2", 1, partTemp ) } - else if ( partTemp != "" ) { + else if ( partTemp ~ /by-label/ ) { label=gensub( /^(\/dev\/disk\/by-label\/)(.+)$/, "\\2", 1, partTemp ) } }