branches/one arch / debugging

This commit is contained in:
inxi-svn 2009-02-04 23:52:46 +00:00
parent cee0dd4867
commit 2da99f4393

13
inxi
View file

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