Add resize method to enlarge the raw image (#3)

Author: wangjiaxi90

builder/qemu/chroot/step_mount_device.go

@@ -68,20 +68,13 @@ func (s *StepMountDevice) Run(_ context.Context, state multistep.StateBag) multi
 	if config.ImageSize > 0 {
 		// sync the file system
 		var fileOsResult string
-		if fileOsResult, err = RunCommand(state, fmt.Sprintf("df -T | grep %s", device)); err != nil {
+		if fileOsResult, err = RunCommand(state, fmt.Sprintf("df --output=source,fstype | grep %s", device)); err != nil {
 			return Halt(state, fmt.Errorf("cannot peek the file system of deivce:\"%s\" ,%s", device, err))
 		}
-		//remove extra space
-		for {
-			if !strings.Contains(fileOsResult, "  ") {
-				break
-			}
-			fileOsResult = strings.Replace(fileOsResult, "  ", " ", -1)
-		}
-		fileOs := strings.SplitN(fileOsResult, " ", -1)[1]
-
+		arr := strings.Split(fileOsResult, " ")
+		fileOs := arr[len(arr)-1]
 		if fileOs == "xfs" {
-			if _, err := RunCommand(state, fmt.Sprintf("xfs_growfs %s", device)); err != nil {
+			if _, err := RunCommand(state, fmt.Sprintf("xfs_growfs %s", mountPath)); err != nil {
 				return Halt(state, fmt.Errorf("sync xfs file system error, device: \"%s\"\t err: %s", device, err))
 			}
 		} else {

builder/qemu/chroot/step_prepare_source_image.go

@@ -3,13 +3,13 @@ package chroot
 import (
 	"context"
 	"fmt"
-	"os"
-	"path"
-	"path/filepath"
-
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/hashicorp/packer-plugin-sdk/packerbuilderdata"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
 )
 
 // StepPrepareSourceImage process the source image.
@@ -70,6 +70,25 @@ func (s *StepPrepareSourceImage) prepareSourceImage(state multistep.StateBag) er
 		if _, err := RunCommand(state, fmt.Sprintf("qemu-img resize %s %dG", s.rawImage, config.ImageSize)); err != nil {
 			return fmt.Errorf("cannot resize raw image : %s", err)
 		}
+		device, err := RunCommand(state, fmt.Sprintf("losetup -f --show %s", s.rawImage))
+		if err != nil {
+			return fmt.Errorf("get device name error: %s", err)
+		}
+		//get parted
+		content, err := RunCommand(state, fmt.Sprintf("parted -m %s p", device))
+		if err != nil {
+			return fmt.Errorf("parted error: %s", err)
+		}
+
+		arr := strings.Split(content, "\n")
+		lastPartNumber := strings.Split(arr[len(arr)-1], ":")[0]
+
+		if _, err := RunCommand(state, fmt.Sprintf("parted -m %s resizepart %s 100%", device, lastPartNumber)); err != nil {
+			return fmt.Errorf("resizepart error : %s", err)
+		}
+		if _, err := RunCommand(state, fmt.Sprintf("losetup -d %s", device)); err != nil {
+			return fmt.Errorf("uninsall device error: %s", err)
+		}
 	}
 	return nil
 }