From d6df9db2292e8b504cdfaf52803eeb80fce4d4cf Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 7 May 2020 11:12:24 -0400 Subject: [PATCH] Change efi/boot to lowercase Consitently use lowercase for efi/boot for easier grub handling. --- confluent_osdeploy/el8/profiles/default/initprofile.sh | 4 ++-- confluent_osdeploy/suse15/profiles/default/initprofile.sh | 4 ++-- .../ubuntu20.04/profiles/default/initprofile.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/confluent_osdeploy/el8/profiles/default/initprofile.sh b/confluent_osdeploy/el8/profiles/default/initprofile.sh index 96f9820c..fdea9df3 100644 --- a/confluent_osdeploy/el8/profiles/default/initprofile.sh +++ b/confluent_osdeploy/el8/profiles/default/initprofile.sh @@ -2,6 +2,6 @@ sed -i 's/centos/CentOS/; s/rhel/Red Hat Enterprise Linux/' $2/profile.yaml ln -s $1/images/pxeboot/vmlinuz $2/boot/kernel && \ ln -s $1/images/pxeboot/initrd.img $2/boot/initramfs/distribution -mkdir -p $2/boot/EFI/BOOT && \ -ln -s $1/EFI/BOOT/BOOTX64.EFI $1/EFI/BOOT/grubx64.efi $2/boot/EFI/BOOT/ +mkdir -p $2/boot/efi/boot && \ +ln -s $1/EFI/BOOT/BOOTX64.EFI $1/EFI/BOOT/grubx64.efi $2/boot/efi/boot/ diff --git a/confluent_osdeploy/suse15/profiles/default/initprofile.sh b/confluent_osdeploy/suse15/profiles/default/initprofile.sh index 28e750e0..7fddaea5 100644 --- a/confluent_osdeploy/suse15/profiles/default/initprofile.sh +++ b/confluent_osdeploy/suse15/profiles/default/initprofile.sh @@ -3,5 +3,5 @@ if [ -e $2/boot/kernel ]; then exit 0; fi sed -i 's/sle 15/SUSE Linux Enterprise 15/; s/opensuse_leap/openSUSE Leap/' $2/profile.yaml ln -s $1/boot/x86_64/loader/linux $2/boot/kernel && \ ln -s $1/boot/x86_64/loader/initrd $2/boot/initramfs/distribution && \ -mkdir -p $2/boot/EFI/BOOT && \ -ln -s $1/EFI/BOOT/bootx64.efi $1/EFI/BOOT/grub.efi $2/boot/EFI/BOOT/ +mkdir -p $2/boot/efi/boot && \ +ln -s $1/EFI/BOOT/bootx64.efi $1/EFI/BOOT/grub.efi $2/boot/efi/boot/ diff --git a/confluent_osdeploy/ubuntu20.04/profiles/default/initprofile.sh b/confluent_osdeploy/ubuntu20.04/profiles/default/initprofile.sh index 84b4124a..00a4229d 100644 --- a/confluent_osdeploy/ubuntu20.04/profiles/default/initprofile.sh +++ b/confluent_osdeploy/ubuntu20.04/profiles/default/initprofile.sh @@ -2,6 +2,6 @@ sed -i s/ubuntu/Ubuntu/ $2/profile.yaml && \ ln -s $1/casper/vmlinuz $2/boot/kernel && \ ln -s $1/casper/initrd $2/boot/initramfs/distribution && \ -mkdir -p $2/boot/EFI/BOOT && \ -ln -s $1/EFI/BOOT/* $2/boot/EFI/BOOT/ +mkdir -p $2/boot/efi/boot && \ +ln -s $1/EFI/BOOT/* $2/boot/efi/boot