diff --git a/diskdetailshelper/gopsutil/disk_windows.go b/diskdetailshelper/gopsutil/disk_windows.go index 26c4e5a07b07484ef1bc343f90c3426f107f85ce..945ae5c66d0598a7ef7549765198b8963298b3d9 100644 --- a/diskdetailshelper/gopsutil/disk_windows.go +++ b/diskdetailshelper/gopsutil/disk_windows.go @@ -8,7 +8,6 @@ import ( "unsafe" "corelab.mkcl.org/MKCLOS/coredevelopmentplatform/coreospackage/logginghelper" - "github.com/shirou/gopsutil/host" "os/exec" "strings" @@ -194,17 +193,18 @@ func RemovableDriveConnected() (bool, error) { // GetDiskSerialNumber returns Serial Number of given device or empty string func GetDiskSerialNumber(name string) string { - info, err := host.Info() - if err != nil { - logginghelper.LogError("GetDiskSerialNumber Host Info() Err : ", err) - // return "" - } + // info, err := host.Info() + // if err != nil { + // logginghelper.LogError("GetDiskSerialNumber Host Info() Err : ", err) + // // return "" + // } cmd := &exec.Cmd{} - if err == nil && (strings.Contains(info.Platform, "Windows 7") || strings.Contains(info.Platform, "Windows 10")) { - cmd = exec.Command("wmic", "diskdrive", "get", "serialnumber") - } else { - cmd = exec.Command("wmic", "path", "win32_physicalmedia", "get", "SerialNumber") - } + // if err == nil && (strings.Contains(info.Platform, "Windows 7") || strings.Contains(info.Platform, "Windows 10")) { + // cmd = exec.Command("wmic", "diskdrive", "get", "serialnumber") + // } else { + // cmd = exec.Command("wmic", "path", "win32_physicalmedia", "get", "SerialNumber") + // } + cmd = exec.Command("wmic", "path", "win32_physicalmedia", "get", "SerialNumber") var out bytes.Buffer cmd.Stdout = &out commandError := cmd.Run()