Skip to content

Commit

Permalink
Don't use vesamenu for now, it breaks some efi boot. We enable two mo…
Browse files Browse the repository at this point in the history
…des, the default is run, renamed to live, the other is installer
  • Loading branch information
kivutar committed Feb 11, 2017
1 parent c5fedd4 commit 47644b5
Showing 1 changed file with 3 additions and 39 deletions.
42 changes: 3 additions & 39 deletions scripts/mkimage
Original file line number Diff line number Diff line change
Expand Up @@ -126,47 +126,16 @@ if [ "$BOOTLOADER" = "syslinux" ]; then
# create bootloader configuration
echo "image: creating bootloader configuration..."
cat << EOF > "$LE_TMP"/syslinux.cfg
UI vesamenu.c32
PROMPT 0
MENU TITLE Boot Menu
MENU BACKGROUND splash.png
SAY Wait for live session to start or press <TAB> for more options (installer)
DEFAULT live
TIMEOUT 50
DEFAULT run
MENU WIDTH 70
MENU MARGIN 15
MENU ROWS 3
MENU HSHIFT 4
MENU VSHIFT 13
MENU TIMEOUTROW 10
MENU TABMSGROW 8
MENU CMDLINEROW 8
MENU HELPMSGROW 13
MENU HELPMSGENDROW 26
MENU CLEAR
MENU COLOR border 30;44 #40ffffff #00000000 std
MENU COLOR title 1;36;44 #ff8bbfe3 #00000000 std
MENU COLOR sel 7;37;40 #80f0f0f0 #ff606060 all
MENU COLOR unsel 37;44 #50ffffff #00000000 std
MENU COLOR help 37;40 #c0ffffff #a0000000 std
MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std
MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std
MENU COLOR msg07 37;40 #90ffffff #a0000000 std
MENU COLOR tabmsg 31;40 #ff868787 #00000000 std
PROMPT 1
LABEL installer
MENU LABEL Run $DISTRONAME Installer
KERNEL /$KERNEL_NAME
APPEND boot=UUID=$UUID_SYSTEM installer quiet tty vga=current
LABEL live
MENU LABEL Run $DISTRONAME Live
KERNEL /$KERNEL_NAME
APPEND boot=UUID=$UUID_SYSTEM live quiet tty vga=current
LABEL run
MENU LABEL Run $DISTRONAME Run
KERNEL /$KERNEL_NAME
APPEND boot=UUID=$UUID_SYSTEM disk=UUID=$UUID_STORAGE portable quiet
EOF
Expand Down Expand Up @@ -196,11 +165,6 @@ EOF
mcopy $RELEASE_DIR/target/KERNEL.md5 "::/$KERNEL_NAME.md5"
mcopy $RELEASE_DIR/target/SYSTEM.md5 ::/SYSTEM.md5

mcopy $RELEASE_DIR/splash.png ::
mcopy $ROOT/$TOOLCHAIN/share/syslinux/vesamenu.c32 ::
mcopy $ROOT/$TOOLCHAIN/share/syslinux/libcom32.c32 ::
mcopy $ROOT/$TOOLCHAIN/share/syslinux/libutil.c32 ::

mmd EFI EFI/BOOT
mcopy $ROOT/$TOOLCHAIN/share/syslinux/bootx64.efi ::/EFI/BOOT
mcopy $ROOT/$TOOLCHAIN/share/syslinux/ldlinux.e64 ::/EFI/BOOT
Expand Down

0 comments on commit 47644b5

Please sign in to comment.