Merge pull request #175 from kubernetes-csi/mbr-disk-fix

k8s-ci-robot · web-flow · commit ebdbe9535a7d · 2021-09-29T14:44:44.000-07:00
fix: check partition error on MBR disk
diff --git a/pkg/os/disk/api.go b/pkg/os/disk/api.go
@@ -158,7 +158,7 @@ func (DiskAPI) InitializeDisk(diskNumber uint32) error {
 }
 
 func (DiskAPI) BasicPartitionsExist(diskNumber uint32) (bool, error) {
-	cmd := fmt.Sprintf("Get-Partition | Where DiskNumber -eq %d | Where Type -eq Basic", diskNumber)
+	cmd := fmt.Sprintf("Get-Partition | Where DiskNumber -eq %d | Where Type -ne Reserved", diskNumber)
 	out, err := runExec(cmd)
 	if err != nil {
 		return false, fmt.Errorf("error checking presence of partitions on disk %d: %v, %v", diskNumber, out, err)

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ func (DiskAPI) InitializeDisk(diskNumber uint32) error {`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`func (DiskAPI) BasicPartitionsExist(diskNumber uint32) (bool, error) {`
`161`		`- cmd := fmt.Sprintf("Get-Partition \| Where DiskNumber -eq %d \| Where Type -eq Basic", diskNumber)`
	`161`	`+ cmd := fmt.Sprintf("Get-Partition \| Where DiskNumber -eq %d \| Where Type -ne Reserved", diskNumber)`
`162`	`162`	`out, err := runExec(cmd)`
`163`	`163`	`if err != nil {`
`164`	`164`	`return false, fmt.Errorf("error checking presence of partitions on disk %d: %v, %v", diskNumber, out, err)`