fix: list full paths while listing via lsblk --paths

Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
openshift · Aug 22, 2022 · a0a6098 · a0a6098
1 parent 4141f72
commit a0a6098
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/pkg/internal/block_device.go b/pkg/internal/block_device.go
@@ -56,7 +56,7 @@ func ListBlockDevices(exec Executor) ([]BlockDevice, error) {
 	// var output bytes.Buffer
 	var blockDeviceMap map[string][]BlockDevice
 	columns := "NAME,ROTA,TYPE,SIZE,MODEL,VENDOR,RO,STATE,KNAME,SERIAL,PARTLABEL,FSTYPE"
-	args := []string{"--json", "-o", columns}
+	args := []string{"--json", "--paths", "-o", columns}
 
 	output, err := exec.ExecuteCommandWithOutput("lsblk", args...)
 	if err != nil {
@@ -106,7 +106,7 @@ func (b BlockDevice) IsUsableLoopDev(exec Executor) (bool, error) {
 
 	usable := true
 
-	args := []string{fmt.Sprintf("/dev/%s", b.Name), "-O", "BACK-FILE", "--json"}
+	args := []string{b.Name, "-O", "BACK-FILE", "--json"}
 
 	output, err := exec.ExecuteCommandWithOutput(losetupPath, args...)
 	if err != nil {
@@ -153,7 +153,7 @@ func (b BlockDevice) HasBindMounts() (bool, string, error) {
 			mountInfoList := strings.Split(mountInfo, " ")
 			if len(mountInfoList) >= 10 {
 				// device source is 4th field for bind mounts and 10th for regular mounts
-				if mountInfoList[3] == fmt.Sprintf("/%s", b.KName) || mountInfoList[9] == fmt.Sprintf("/dev/%s", b.KName) {
+				if mountInfoList[3] == fmt.Sprintf("/%s", filepath.Base(b.KName)) || mountInfoList[9] == b.KName {
 					return true, mountInfoList[4], nil
 				}
 			}

diff --git a/pkg/vgmanager/vgmanager_controller.go b/pkg/vgmanager/vgmanager_controller.go
@@ -375,7 +375,7 @@ func (r *VGReconciler) addDevicesToVG(vgName string, devices []internal.BlockDev
 		if device.DiskByPath != "" {
 			args = append(args, device.DiskByPath)
 		} else {
-			args = append(args, fmt.Sprintf("/dev/%s", device.KName))
+			args = append(args, device.KName)
 		}
 	}
 
@@ -420,8 +420,7 @@ func (r *VGReconciler) filterMatchingDevices(blockDevices []internal.BlockDevice
 				continue
 			}
 
-			baseDiskName := filepath.Base(diskName)
-			blockDevice, ok := hasExactDisk(blockDevices, baseDiskName)
+			blockDevice, ok := hasExactDisk(blockDevices, diskName)
 
 			if filepath.Dir(path) == internal.DiskByPathPrefix {
 				// handle disk by path here such as /dev/disk/by-path/pci-0000:87:00.0-nvme-1