Merge pull request #52 from philips/add-hvc0-to-grub

Add hvc0 to grub
This commit is contained in:
Brandon Philips 2013-07-22 18:22:02 -07:00
commit abc38e033b

View File

@ -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.
@ -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"