From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Mon, 20 Sep 2010 15:55:55 +0000 (-0700)
Subject: Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
X-Git-Tag: v2.9.0~128
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/3a66518f9071f3d5375834c44086c0c6e538b2ef

Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
---

3a66518f9071f3d5375834c44086c0c6e538b2ef
diff --cc sys/boot/dloader/dloader.menu
index f219b3d106,e85400c0eb..e3befbd0cf
--- a/sys/boot/dloader/dloader.menu
+++ b/sys/boot/dloader/dloader.menu
@@@ -118,8 -118,8 +118,9 @@@ menuadd boo
  menuadd set autoboot_delay=NO
  
  menuitem 9 "Escape to loader prompt (also ESC)"
+ menuadd optcd kernel
  menuadd set autoboot_delay=NO
 +menuadd optcd kernel
  
  menuitem a "Boot Backup kernel kernel.alt"
  menuadd cd ${base}kernel.alt