Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[disk][linux] fix readlink error which system boot by nfs mount #1291

Merged
merged 2 commits into from May 5, 2022
Merged

[disk][linux] fix readlink error which system boot by nfs mount #1291

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d52b97c
fix disk readlink error which system boot by nfs mount
arstercz Apr 27, 2022
f6dc96c
follow the psutil principles, do nothing if can not find root device
arstercz May 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions disk/disk_linux.go
View file
Open in desktop
Expand Up @@ -351,10 +351,9 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
// so we get the real device name from its major/minor number
if d.Device == "/dev/root" {
devpath, err := os.Readlink(common.HostSys("/dev/block/" + blockDeviceID))
if err != nil {
return nil, err
if err == nil {
d.Device = strings.Replace(d.Device, "root", filepath.Base(devpath), 1)
}
d.Device = strings.Replace(d.Device, "root", filepath.Base(devpath), 1)
}
}
ret = append(ret, d)
Expand Down