[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4933/8267] wic: add more targets to directdisk syslinux config

[Emmanuele Bassi <ebassi src gnome org>]

commit 13c54959dd04a9f142bc4347ea89c9bfc229d17d
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Thu Feb 23 16:22:04 2017 +0200

    wic: add more targets to directdisk syslinux config
    
    Added 3 new targets to directdisk-bootloader-config.cfg to
    match hddimg syslinux config.
    
    This is a preparation for dropping hddimg in favor of wic.
    
    [YOCTO #11044]
    
    (From OE-Core rev: 95bf0af5293a7f5868abd85f4fc15f5c542bfd09)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../canned-wks/directdisk-bootloader-config.cfg    |   28 +++++++++++++++----
 1 files changed, 22 insertions(+), 6 deletions(-)
---
diff --git a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg 
b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
index a16bd6a..d5a07d2 100644
--- a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
+++ b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
@@ -1,11 +1,27 @@
 # This is an example configuration file for syslinux.
-PROMPT 0
-TIMEOUT 10
-
+TIMEOUT 50
 ALLOWOPTIONS 1
 SERIAL 0 115200
+PROMPT 0
+
+UI vesamenu.c32
+menu title Select boot options
+menu tabmsg Press [Tab] to edit, [Return] to select
+
+DEFAULT Graphics console boot
+
+LABEL Graphics console boot
+KERNEL /vmlinuz
+APPEND label=boot root=/dev/sda2 rootwait
+
+LABEL Serial console boot
+KERNEL /vmlinuz
+APPEND label=boot root=/dev/sda2 rootwait console=ttyS0,115200
+
+LABEL Graphics console install
+KERNEL /vmlinuz
+APPEND label=install root=/dev/sda2 rootwait
 
-DEFAULT boot
-LABEL boot
+LABEL Serial console install
 KERNEL /vmlinuz
-APPEND label=boot root=/dev/sda2 rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0
+APPEND label=install root=/dev/sda2 rootwait console=ttyS0,115200