From fba8ae55ba4afd5a0bd7c96c68fb16d2ad2ace0b Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 12 Nov 2016 17:46:33 +0000 Subject: UEFI boot: refactored files, updated theme, added options to boot with proprietary drivers. --- config/live.cfg | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'config') diff --git a/config/live.cfg b/config/live.cfg index f9a99ea..26c90dd 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -263,15 +263,16 @@ my $_l = { source => build_one_label($live), pre => [ 'for i in seq 1 5; do showlabels --removable | grep ' . build_one_label($live) . '; if [ $? -eq 0 ]; then break; fi; sleep 1; done' ], extra_modules => [ qw(vfat sd_mod usb_storage ehci_hcd ehci_pci ehci_platform ohci_hcd ohci_pci ohci_platform uhci_hcd xhci_hcd xhci_pci xhci_plat_hcd) ], - files => [ - if_($live->{settings}{arch} eq 'x86_64', - if_($live->{settings}{desktop} eq 'PLASMA5', - [ 'files/UEFI/PLASMA5/*', '' ], - ), - if_($live->{settings}{desktop} eq 'GNOME', - [ 'files/UEFI/GNOME/*', '' ], - ), - ), + files => [ + if_($live->{settings}{arch} eq 'x86_64', + [ 'files/UEFI/EFI', '' ], + if_($live->{settings}{desktop} eq 'PLASMA5', + [ 'files/UEFI/PLASMA5/grub.cfg', 'EFI/BOOT/' ], + ), + if_($live->{settings}{desktop} eq 'GNOME', + [ 'files/UEFI/GNOME/grub.cfg', 'EFI/BOOT/' ], + ), + ), # FIXME: add doc and autorun #[ 'extra/livecd/autorun/*', ''], #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) -- cgit v1.2.1