manuel
/
gentoo-install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: remove unnecessary /EFI subdirectory in the efi partition

This commit is contained in:
oddlama 2022-04-16 15:31:11 +02:00
parent 1f3f5df584
commit eb067c5d6c
No known key found for this signature in database
GPG Key ID: 14EFE510775FE39A
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/main.sh
View File

@ -168,12 +168,11 @@ function install_kernel_efi() {
kernel_file="$(find "/boot" -name "vmlinuz-*" -printf '%f\n' | sort -V | tail -n 1)" \ kernel_file="$(find "/boot" -name "vmlinuz-*" -printf '%f\n' | sort -V | tail -n 1)" \
|| die "Could not list newest kernel file" || die "Could not list newest kernel file"
mkdir_or_die 0755 "/boot/efi/EFI" cp "/boot/$kernel_file" "/boot/efi/vmlinuz.efi" \
cp "/boot/$kernel_file" "/boot/efi/EFI/vmlinuz.efi" \
|| die "Could not copy kernel to EFI partition" || die "Could not copy kernel to EFI partition"
# Generate initramfs # Generate initramfs
generate_initramfs "/boot/efi/EFI/initramfs.img" generate_initramfs "/boot/efi/initramfs.img"
# Create boot entry # Create boot entry
einfo "Creating efi boot entry" einfo "Creating efi boot entry"
@ -186,7 +185,7 @@ function install_kernel_efi() {
local gptdev local gptdev
gptdev="$(resolve_device_by_id "${DISK_ID_PART_TO_GPT_ID[$DISK_ID_EFI]}")" \ gptdev="$(resolve_device_by_id "${DISK_ID_PART_TO_GPT_ID[$DISK_ID_EFI]}")" \
|| die "Could not resolve device with id=${DISK_ID_PART_TO_GPT_ID[$DISK_ID_EFI]}" || die "Could not resolve device with id=${DISK_ID_PART_TO_GPT_ID[$DISK_ID_EFI]}"
try efibootmgr --verbose --create --disk "$gptdev" --part "$efipartnum" --label "gentoo" --loader '\EFI\vmlinuz.efi' --unicode 'initrd=\EFI\initramfs.img'" $(get_cmdline)" try efibootmgr --verbose --create --disk "$gptdev" --part "$efipartnum" --label "gentoo" --loader '\vmlinuz.efi' --unicode 'initrd=\initramfs.img'" $(get_cmdline)"
} }
function generate_syslinux_cfg() { function generate_syslinux_cfg() {