mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-12 15:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #318 from marineam/gce

Browse Source 
vm_image_util: use only ttyS0 for the console on GCE instances
This commit is contained in:
Michael Marineau 2014-08-24 16:55:58 -07:00
commit d97f6e7332
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build_library/vm_image_util.sh
View File

@ -152,6 +152,7 @@ IMG_iso_CONF_FORMAT=iso
IMG_gce_DISK_LAYOUT=vm IMG_gce_DISK_LAYOUT=vm
IMG_gce_CONF_FORMAT=gce IMG_gce_CONF_FORMAT=gce
IMG_gce_OEM_PACKAGE=oem-gce IMG_gce_OEM_PACKAGE=oem-gce
IMG_gce_FS_HOOK=gce
## rackspace ## rackspace
IMG_rackspace_BOOT_KERNEL=0 IMG_rackspace_BOOT_KERNEL=0
@ -342,6 +343,13 @@ _run_onmetal_fs_hook() {
-e "s/^TOTALTIMEOUT [0-9]*/TOTALTIMEOUT ${totaltimeout}/g" -e "s/^TOTALTIMEOUT [0-9]*/TOTALTIMEOUT ${totaltimeout}/g"
} }
_run_gce_fs_hook() {
# HACKITY HACK until OEMs can customize bootloader configs
local arg='console=ttyS0,115200n8'
sudo sed -i "${VM_TMP_ROOT}/boot/efi/syslinux/boot_kernel.cfg" \
-e 's/console=[^ ]*//g' -e "s/\\(append.*$\\)/\\1 ${arg}/"
}
# Write the vm disk image to the target directory in the proper format # Write the vm disk image to the target directory in the proper format
write_vm_disk() { write_vm_disk() {
if [[ $(_get_vm_opt PARTITIONED_IMG) -eq 1 ]]; then if [[ $(_get_vm_opt PARTITIONED_IMG) -eq 1 ]]; then