From c21b8ee03d7a4bfc27de7473f4b6bf35e8f0bcf7 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Fri, 16 Aug 2013 15:00:29 -0400
Subject: [PATCH] cleanup(boot): remove lingering dm-verity bits, cleanup
 kernel args.

Remove unused dev/dm-0 vs dm-1 logic from verity and the associated
rootwait option it required (meaningless with our initrd). Move old
cros_legacy to common instead of using it in every command line option.
We should remove it entirely soon since it isn't useful for us. Remove
unneeded intel graphics modeset option.
---
 .../create_legacy_bootloader_templates.sh     | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/build_library/create_legacy_bootloader_templates.sh b/build_library/create_legacy_bootloader_templates.sh
index 3399316506..7f90302565 100755
--- a/build_library/create_legacy_bootloader_templates.sh
+++ b/build_library/create_legacy_bootloader_templates.sh
@@ -40,20 +40,9 @@ switch_to_strict_mode
 # Useful for getting partition UUID values
 . "${BUILD_LIBRARY_DIR}/disk_layout_util.sh" || exit 1
 
-# Only let dm-verity block if rootfs verification is configured.
-# Also, set which device mapper correspondes to verity
-dev_wait=0
-ROOTDEV=/dev/dm-0
-if [[ ${FLAGS_enable_rootfs_verification} -eq ${FLAGS_TRUE} ]]; then
-  dev_wait=1
-  if [[ ${FLAGS_enable_bootcache} -eq ${FLAGS_TRUE} ]]; then
-    ROOTDEV=/dev/dm-1
-  fi
-fi
-
 # Common kernel command-line args
-common_args="console=tty0 rootwait ro"
-common_args="${common_args} noswap ${FLAGS_boot_args}"
+common_args="console=tty0 ro noswap cros_legacy"
+common_args="${common_args} ${FLAGS_boot_args}"
 
 # Populate the x86 rootfs to support legacy and EFI bios config templates.
 # The templates are used by the installer to populate partition 12 with
@@ -77,23 +66,23 @@ timeout         0
 
 title           CoreOS A Kernel
 root            (hd0,0)
-kernel          /syslinux/vmlinuz.A ${grub_args} root=gptprio: cros_legacy
+kernel          /syslinux/vmlinuz.A ${grub_args} root=gptprio:
 
 title           CoreOS B Kernel
 root            (hd0,0)
-kernel          /syslinux/vmlinuz.B ${grub_args} root=gptprio: cros_legacy
+kernel          /syslinux/vmlinuz.B ${grub_args} root=gptprio:
 
 title           CoreOS bootengine
 root            (hd0,0)
-kernel          /syslinux/vmlinuz-boot_kernel ${grub_args} root=gptprio: cros_legacy
+kernel          /syslinux/vmlinuz-boot_kernel ${grub_args} root=gptprio:
 
 title           CoreOS A Root Rescue
 root            (hd0,0)
-kernel          /syslinux/vmlinuz.A ${grub_args} root=${ROOTA} cros_legacy
+kernel          /syslinux/vmlinuz.A ${grub_args} root=${ROOTA}
 
 title           CoreOS B Root Rescue
 root            (hd0,0)
-kernel          /syslinux/vmlinuz.B ${grub_args} root=${ROOTB} cros_legacy
+kernel          /syslinux/vmlinuz.B ${grub_args} root=${ROOTB}
 EOF
   info "Emitted ${GRUB_DIR}/menu.lst.A"
 
@@ -130,14 +119,14 @@ EOF
 label boot_kernel
   menu label boot_kernel
   kernel vmlinuz-boot_kernel
-  append ${common_args} root=gptprio: cros_legacy
+  append ${common_args} root=gptprio:
 EOF
   info "Emitted ${SYSLINUX_DIR}/boot_kernel.cfg"
   cat <<EOF | sudo dd of="${SYSLINUX_DIR}/root.A.cfg" 2>/dev/null
 label coreos.A
   menu label coreos.A
   kernel vmlinuz.A
-  append ${common_args} root=${ROOTA} i915.modeset=1 cros_legacy
+  append ${common_args} root=${ROOTA}
 EOF
   info "Emitted ${SYSLINUX_DIR}/root.A.cfg"
 
@@ -145,7 +134,7 @@ EOF
 label coreos.B
   menu label coreos.B
   kernel vmlinuz.B
-  append ${common_args} root=${ROOTB} i915.modeset=1 cros_legacy
+  append ${common_args} root=${ROOTB}
 EOF
   info "Emitted ${SYSLINUX_DIR}/root.B.cfg"