From 909bd23b9895465a03f810b302cd767704a81adb Mon Sep 17 00:00:00 2001
From: Sergio Andres Rodriguez Orama <sorama@google.com>
Date: Fri, 13 Mar 2026 16:09:49 -0400
Subject: [PATCH] hostimage: use 32gb attached disk when installing cuttlefish
 packages.

Bug: b/491188376
---
 .../cmd/gce_install_cuttlefish_packages/main.go     |  9 +++++----
 tools/baseimage/pkg/gce/gce.go                      | 13 +++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tools/baseimage/cmd/gce_install_cuttlefish_packages/main.go b/tools/baseimage/cmd/gce_install_cuttlefish_packages/main.go
index bc07888ead7..e6382d41d72 100644
--- a/tools/baseimage/cmd/gce_install_cuttlefish_packages/main.go
+++ b/tools/baseimage/cmd/gce_install_cuttlefish_packages/main.go
@@ -92,10 +92,11 @@ func main() {
 	}
 
 	buildImageOpts := gce.BuildImageOpts{
-		Arch:               arch.GceArch(),
-		SourceImageProject: sourceImageProject,
-		SourceImage:        sourceImage,
-		ImageName:          imageName,
+		Arch:                   arch.GceArch(),
+		SourceImageProject:     sourceImageProject,
+		SourceImage:            sourceImage,
+		ImageName:              imageName,
+		CreateAttachedDiskOpts: gce.CreateDiskOpts{SizeGb: 32},
 		ModifyFunc: func(project, zone, insName string) error {
 			dstSrcs := []string{}
 			for _, src := range debSrcs.Srcs {
diff --git a/tools/baseimage/pkg/gce/gce.go b/tools/baseimage/pkg/gce/gce.go
index 581e47ca34a..f9c0e7e57f2 100644
--- a/tools/baseimage/pkg/gce/gce.go
+++ b/tools/baseimage/pkg/gce/gce.go
@@ -225,11 +225,12 @@ func (h *GceHelper) CreateImage(ins, disk, name string) error {
 }
 
 type BuildImageOpts struct {
-	Arch               Arch
-	SourceImageProject string
-	SourceImage        string
-	ImageName          string
-	ModifyFunc         func(project, zone, insName string) error
+	Arch                   Arch
+	SourceImageProject     string
+	SourceImage            string
+	ImageName              string
+	CreateAttachedDiskOpts CreateDiskOpts
+	ModifyFunc             func(project, zone, insName string) error
 }
 
 const BuildImageMountPoint = "/mnt/image"
@@ -239,7 +240,7 @@ func (h *GceHelper) BuildImage(project, zone string, opts BuildImageOpts) error
 	attachedDiskName := fmt.Sprintf("%s-attached-disk", insName)
 
 	log.Println("creating disk...")
-	if _, err := h.CreateDisk(opts.SourceImageProject, opts.SourceImage, attachedDiskName, CreateDiskOpts{}); err != nil {
+	if _, err := h.CreateDisk(opts.SourceImageProject, opts.SourceImage, attachedDiskName, opts.CreateAttachedDiskOpts); err != nil {
 		return fmt.Errorf("failed to create disk: %w", err)
 	}
 	defer h.cleanupDeleteDisk(attachedDiskName)