Merge pull request ppc64le-cloud#594 from kishen-v/clear-loopdevice

Free up loopdevice after image is built

Author: Power Cloud Robot

cmd/image/qcow2ova/prep/loop.go

@@ -29,15 +29,6 @@ import (
 
 const losetupCMD = "losetup"
 
-func findFreeLoop(file string) (string, error) {
-	exitcode, out, err := utils.RunCMD(losetupCMD, "-f")
-	if exitcode != 0 {
-		return "", fmt.Errorf("failed to find an unused loop device, exitcode: %d, stdout: %s, err: %s", exitcode, out, err)
-	}
-
-	return strings.TrimSpace(out), nil
-}
-
 // setupLoop allocates the free loop device for the backing store
 func setupLoop(file string) (string, error) {
 	exitcode, out, err := utils.RunCMD(losetupCMD, "-f", "--show", file)
@@ -48,6 +39,14 @@ func setupLoop(file string) (string, error) {
 	return strings.TrimSpace(out), nil
 }
 
+func removeLoop(loopPath string) error {
+	exitcode, stdout, stderr := utils.RunCMD(losetupCMD, "-d", loopPath)
+	if exitcode != 0 {
+		return fmt.Errorf("failed to remove loop device: %s, exitcode: %d, stdout: %s, err: %s", loopPath, exitcode, stdout, stderr)
+	}
+	return nil
+}
+
 func partprobe(device string) error {
 	exitcode, out, err := utils.RunCMD("partprobe", device)
 	if exitcode != 0 {

cmd/image/qcow2ova/prep/prepare.go

@@ -39,6 +39,7 @@ func prepare(mnt, volume, dist, rhnuser, rhnpasswd, rootpasswd string) error {
 	if err != nil {
 		return err
 	}
+	defer removeLoop(lo)
 
 	err = partprobe(lo)
 	if err != nil {