From a9233654498c1a4f5c48b7880f087de9769303b8 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.co>
Date: Mon, 22 Jul 2013 17:36:17 -0700
Subject: [PATCH 1/2] chore(build_library/create_legacy_bootloader): remove old
 stuff

We don't need all of these args. Remove them.
---
 build_library/create_legacy_bootloader_templates.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_library/create_legacy_bootloader_templates.sh b/build_library/create_legacy_bootloader_templates.sh
index 02aaba35db..3b25ce8811 100755
--- a/build_library/create_legacy_bootloader_templates.sh
+++ b/build_library/create_legacy_bootloader_templates.sh
@@ -52,7 +52,7 @@ if [[ ${FLAGS_enable_rootfs_verification} -eq ${FLAGS_TRUE} ]]; then
 fi
 
 # Common kernel command-line args
-common_args="init=/sbin/init console=tty0 boot=local rootwait ro noresume"
+common_args="console=tty0 rootwait ro"
 common_args="${common_args} noswap ${FLAGS_boot_args}"
 
 # Populate the x86 rootfs to support legacy and EFI bios config templates.

From 69803d5ad603267de45f005f0d025026b289d1f4 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.co>
Date: Mon, 22 Jul 2013 17:37:51 -0700
Subject: [PATCH 2/2] feat(create_legacy_bootloader): add hvc0 on Xen

add console=hvc0 for systems that use pygrub/pvgrub by adding it to the
menu.lst files.
---
 build_library/create_legacy_bootloader_templates.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/build_library/create_legacy_bootloader_templates.sh b/build_library/create_legacy_bootloader_templates.sh
index 3b25ce8811..3399316506 100755
--- a/build_library/create_legacy_bootloader_templates.sh
+++ b/build_library/create_legacy_bootloader_templates.sh
@@ -69,28 +69,31 @@ if [[ "${FLAGS_arch}" = "x86" || "${FLAGS_arch}" = "amd64"  ]]; then
   GRUB_DIR="${FLAGS_to}/boot/grub"
   sudo mkdir -p "${GRUB_DIR}"
 
+  # Add hvc0 for hypervisors
+  grub_args="${common_args} console=hvc0"
+
   cat <<EOF | sudo dd of="${GRUB_DIR}/menu.lst.A" 2>/dev/null
 timeout         0
 
 title           CoreOS A Kernel
 root            (hd0,0)
-kernel          /syslinux/vmlinuz.A ${common_args} root=gptprio: cros_legacy
+kernel          /syslinux/vmlinuz.A ${grub_args} root=gptprio: cros_legacy
 
 title           CoreOS B Kernel
 root            (hd0,0)
-kernel          /syslinux/vmlinuz.B ${common_args} root=gptprio: cros_legacy
+kernel          /syslinux/vmlinuz.B ${grub_args} root=gptprio: cros_legacy
 
 title           CoreOS bootengine
 root            (hd0,0)
-kernel          /syslinux/vmlinuz-boot_kernel ${common_args} root=gptprio: cros_legacy
+kernel          /syslinux/vmlinuz-boot_kernel ${grub_args} root=gptprio: cros_legacy
 
 title           CoreOS A Root Rescue
 root            (hd0,0)
-kernel          /syslinux/vmlinuz.A ${common_args} root=${ROOTA} cros_legacy
+kernel          /syslinux/vmlinuz.A ${grub_args} root=${ROOTA} cros_legacy
 
 title           CoreOS B Root Rescue
 root            (hd0,0)
-kernel          /syslinux/vmlinuz.B ${common_args} root=${ROOTB} cros_legacy
+kernel          /syslinux/vmlinuz.B ${grub_args} root=${ROOTB} cros_legacy
 EOF
   info "Emitted ${GRUB_DIR}/menu.lst.A"