Merge pull request #307 from Shilpi-Das1/getting_partions_dynamically

Get the partition number of the image

Author: Power Cloud Robot

cmd/image/qcow2ova/prep/loop.go

@@ -49,6 +49,16 @@ func partprobe(device string) error {
 	return nil
 }
 
+// get partition number of the image
+func getPartition(device string) (string, error) {
+	args := fmt.Sprintf("fdisk -l %s | grep ^/dev | wc -l", device)
+	exitcode, out, err := utils.RunCMD("bash", "-c", args)
+	if exitcode != 0 {
+		return "", fmt.Errorf("failed to get partition for device: %s, exitcode: %d, stdout: %s, err: %s", device, exitcode, out, err)
+	}
+	return strings.TrimSpace(out), nil
+}
+
 // growpart resizes the partition
 func growpart(device, partition string) error {
 	exitcode, out, err := utils.RunCMD("growpart", device, partition)

cmd/image/qcow2ova/prep/prepare.go

@@ -45,8 +45,11 @@ func prepare(mnt, volume, dist, rhnuser, rhnpasswd, rootpasswd string) error {
 		return err
 	}
 
-	// TODO: Get this partition number from the image
-	partition := "2"
+	partition, err := getPartition(lo)
+	if err != nil {
+		return err
+	}
+
 	partDev := lo + "p" + partition
 
 	err = mount("nouuid", partDev, mnt)