Bash scripts for building GCE image is directly executed by golang script.

Author: 0405ysj

tools/baseimage/cmd/create_gce_x86_64_fixed_kernel/main.go

@@ -29,13 +29,19 @@ const (
 	debianSourceImage        = "debian-13-trixie-v20251014"
 )
 
+const mountpoint = "/mnt/image"
+
 var (
 	project       = flag.String("project", "", "GCE project whose resources will be used for creating the image")
 	zone          = flag.String("zone", "us-central1-a", "GCE zone used for creating relevant resources")
 	linuxImageDeb = flag.String("linux-image-deb", "", "linux-image-* package name. E.g. linux-image-6.1.0-40-cloud-amd64")
 	imageName     = flag.String("image-name", "", "output GCE image name")
 )
 
+func mountAttachedDisk(project, zone, insName string) error {
+	return gce.RunCmd(project, zone, insName, "./mount_attached_disk.sh "+mountpoint)
+}
+
 func createImageMain(project, zone, linuxImageDeb, imageName string) error {
 	h, err := gce.NewGceHelper(project, zone)
 	if err != nil {
@@ -101,6 +107,9 @@ func createImageMain(project, zone, linuxImageDeb, imageName string) error {
 		}
 	}
 	// Execute Scripts
+	if err := mountAttachedDisk(project, zone, insName); err != nil {
+		return fmt.Errorf("mountAttachedDisk error: %v", err)
+	}
 	if err := gce.RunCmd(project, zone, insName, "./install_kernel_main.sh "+linuxImageDeb); err != nil {
 		return err
 	}

tools/baseimage/cmd/create_gce_x86_64_image/main.go

@@ -24,6 +24,8 @@ import (
 	"github.com/google/android-cuttlefish/tools/baseimage/pkg/gce/scripts"
 )
 
+const mountpoint = "/mnt/image"
+
 var (
 	project              = flag.String("project", "", "GCE project whose resources will be used for creating the image")
 	zone                 = flag.String("zone", "us-central1-a", "GCE zone used for creating relevant resources")
@@ -38,6 +40,14 @@ type createImageOpts struct {
 	ImageName          string
 }
 
+func fillAvailableSpace(project, zone, insName string) error {
+	return gce.RunCmd(project, zone, insName, "./fill_available_disk_space.sh")
+}
+
+func mountAttachedDisk(project, zone, insName string) error {
+	return gce.RunCmd(project, zone, insName, "./mount_attached_disk.sh "+mountpoint)
+}
+
 func createImageMain(project, zone string, opts createImageOpts) error {
 	h, err := gce.NewGceHelper(project, zone)
 	if err != nil {
@@ -94,6 +104,7 @@ func createImageMain(project, zone string, opts createImageOpts) error {
 		dstname string
 		content string
 	}{
+		{"fill_available_disk_space.sh", scripts.FillAvailableDiskSpace},
 		{"mount_attached_disk.sh", scripts.MountAttachedDisk},
 		{"install_nvidia.sh", scripts.InstallNvidia},
 		{"create_base_image_main.sh", scripts.CreateBaseImageMain},
@@ -104,6 +115,12 @@ func createImageMain(project, zone string, opts createImageOpts) error {
 		}
 	}
 	// Execute Scripts
+	if err := fillAvailableSpace(project, zone, insName); err != nil {
+		return fmt.Errorf("fillAvailableSpace error: %v", err)
+	}
+	if err := mountAttachedDisk(project, zone, insName); err != nil {
+		return fmt.Errorf("mountAttachedDisk error: %v", err)
+	}
 	if err := gce.RunCmd(project, zone, insName, "./create_base_image_main.sh"); err != nil {
 		return err
 	}

tools/baseimage/cmd/gce_install_cuttlefish_packages/main.go

@@ -94,7 +94,7 @@ func fillAvailableSpace(project, zone, insName string) error {
 	return gce.RunCmd(project, zone, insName, "./fill_available_disk_space.sh")
 }
 
-func mountAttachedDisk(project, zone, insName, mountpoint string) error {
+func mountAttachedDisk(project, zone, insName string) error {
 	return gce.RunCmd(project, zone, insName, "./mount_attached_disk.sh "+mountpoint)
 }
 
@@ -196,7 +196,7 @@ func amendImageMain(project, zone string, opts amendImageOpts) error {
 		return fmt.Errorf("fillAvailableSpace error: %v", err)
 	}
 
-	if err := mountAttachedDisk(project, zone, insName, mountpoint); err != nil {
+	if err := mountAttachedDisk(project, zone, insName); err != nil {
 		return fmt.Errorf("mountAttachedDisk error: %v", err)
 	}
 

tools/baseimage/pkg/gce/scripts/create_base_image_main.sh

@@ -22,16 +22,6 @@ sudo apt-get upgrade -y
 # Avoids blocking "Default mirror not found" popup prompt when pbuilder is installed.
 echo "pbuilder        pbuilder/mirrorsite     string  https://deb.debian.org/debian" | sudo debconf-set-selections
 
-# Resize
-sudo apt install -y cloud-utils
-sudo apt install -y cloud-guest-utils
-sudo apt install -y fdisk
-sudo growpart /dev/sdb 1 || /bin/true
-sudo e2fsck -f -y /dev/sdb1 || /bin/true
-sudo resize2fs /dev/sdb1
-
-./mount_attached_disk.sh /mnt/image
-
 kmodver_begin=$(sudo chroot /mnt/image/ /usr/bin/dpkg -s linux-image-cloud-amd64 | grep ^Depends: | \
   cut -d: -f2 | cut -d" " -f2 | sed 's/linux-image-//')
 echo "IMAGE STARTS WITH KERNEL: ${kmodver_begin}"

tools/baseimage/pkg/gce/scripts/install_kernel_main.sh

@@ -26,8 +26,6 @@ linux_image_deb=$1
 sudo apt-get update
 sudo apt-get upgrade -y
 
-./mount_attached_disk.sh /mnt/image
-
 version=$(sudo chroot /mnt/image/ /usr/bin/dpkg -s linux-image-cloud-amd64 | grep ^Depends: | \
   cut -d: -f2 | cut -d" " -f2 )
 echo "START VERSION: ${version}"