OrgGo
/
shirou_gopsutil
mirror of https://hub.fastgit.org/shirou/gopsutil.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

It could be another error than the "self/mountinfo" missing

This commit is contained in:
JHE 2019-02-10 00:01:25 +08:00
parent 06a21ae66a
commit a08b926ce6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
disk/disk_linux.go
View File

@ -229,12 +229,12 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
filename := common.HostProc("self/mountinfo")
lines, err := common.ReadLines(filename)
if err != nil {
useMounts = true
if err != err.(*os.PathError) {
return nil, err
}
//if kernel not support self/mountinfo
if useMounts {
filename := common.HostProc("self/mounts")
useMounts = true
filename = common.HostProc("self/mounts")
lines, err = common.ReadLines(filename)
if err != nil {
return nil, err
@ -248,9 +248,8 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
ret := make([]PartitionStat, 0, len(lines))
var d PartitionStat
for _, line := range lines {
var d PartitionStat
// a line of self/mountinfo has the following structure:
// 36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3 /dev/root rw,errors=continue
// (1) (2) (3) (4) (5) (6) (7) (8) (9) (10) (11)