Skip to content

Commit 12587f8

Browse files
committed
Cleanup kernel handling logic in create base image tool.
- Bug: b/446172232
1 parent d792fc9 commit 12587f8

File tree

2 files changed

+1
-30
lines changed

2 files changed

+1
-30
lines changed

tools/baseimage/cmd/create_gce_x86_64_image/main.go

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,28 +95,16 @@ func createImageMain(project, zone string) error {
9595
dstname string
9696
content string
9797
}{
98-
{"update_kernel.sh", scripts.UpdateKernel},
99-
{"remove_old_kernel.sh", scripts.RemoveOldKernel},
10098
{"mount_attached_disk.sh", scripts.MountAttachedDisk},
10199
{"install_nvidia.sh", scripts.InstallNvidia},
102100
{"create_base_image_main.sh", scripts.CreateBaseImageMain},
103101
}
104102
for _, s := range list {
105103
if err := gce.UploadBashScript(project, zone, insName, s.dstname, s.content); err != nil {
106-
return fmt.Errorf("error uploading update_kernel.sh: %v", err)
104+
return fmt.Errorf("error uploading script: %v", err)
107105
}
108106
}
109107
// Execute Scripts
110-
if err := gce.RunCmd(project, zone, insName, "./update_kernel.sh"); err != nil {
111-
return err
112-
}
113-
time.Sleep(2 * time.Minute) // update kernel script ends up rebooting the instance
114-
if err := gce.WaitForInstance(project, zone, insName); err != nil {
115-
return fmt.Errorf("waiting for instance error: %v", err)
116-
}
117-
if err := gce.RunCmd(project, zone, insName, "./remove_old_kernel.sh"); err != nil {
118-
return err
119-
}
120108
if err := gce.RunCmd(project, zone, insName, "./create_base_image_main.sh"); err != nil {
121109
return err
122110
}

tools/baseimage/pkg/gce/scripts/scripts.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,6 @@
1414

1515
package scripts
1616

17-
// https://cs.android.com/android/platform/superproject/main/+/main:device/google/cuttlefish/tools/update_gce_kernel.sh;drc=7f601ad9132960b58ee3d7fe8f8b382d20720a22
18-
const UpdateKernel = `#!/usr/bin/env bash
19-
set -o errexit -o nounset -o pipefail
20-
21-
sudo apt update
22-
sudo apt install -t bookworm -y linux-image-cloud-amd64
23-
sudo reboot
24-
`
25-
26-
// https://cs.android.com/android/platform/superproject/main/+/main:device/google/cuttlefish/tools/update_gce_kernel.sh;drc=7f601ad9132960b58ee3d7fe8f8b382d20720a22
27-
const RemoveOldKernel = `#!/usr/bin/env bash
28-
set -o errexit -o nounset -o pipefail
29-
30-
dpkg --list | grep -v $(uname -r) | grep -E 'linux-image-[0-9]|linux-headers-[0-9]' | awk '{print $2" "$3}' | sort -k2,2 | awk '{print $1}' | xargs sudo apt-get -y purge
31-
sudo update-grub2
32-
`
33-
3417
// Mount attached disk `/dev/sdb1` at `/mnt/image`.
3518
const MountAttachedDisk = `#!/usr/bin/env bash
3619
set -o errexit -o nounset -o pipefail

0 commit comments

Comments
 (0)