From 4f2d4a7709619577ebfb58c7887c0e8fa889fa05 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Thu, 7 May 2020 09:32:11 -0400
Subject: [PATCH] Move media content out of subdirectory

This paves the way for a consistent organization of boot
media
and network based boot.
---
 confluent_osdeploy/el8/profiles/default/initprofile.sh   | 4 ++--
 .../suse15/profiles/default/initprofile.sh               | 9 +++++----
 .../ubuntu20.04/profiles/default/initprofile.sh          | 4 ++--
 confluent_server/confluent/discovery/protocols/pxe.py    | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/confluent_osdeploy/el8/profiles/default/initprofile.sh b/confluent_osdeploy/el8/profiles/default/initprofile.sh
index 0f2f50af..96f9820c 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/media/EFI/BOOT && \
-ln -s $1/EFI/BOOT/BOOTX64.EFI $1/1/EFI/BOOT/grubx64.efi $2/boot/media/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 d60ac3bf..28e750e0 100644
--- a/confluent_osdeploy/suse15/profiles/default/initprofile.sh
+++ b/confluent_osdeploy/suse15/profiles/default/initprofile.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
+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/1/boot/x86_64/loader/linux $2/boot/kernel && \
-ln -s $1/1/boot/x86_64/loader/initrd $2/boot/initramfs/distribution && \
-mkdir -p $2/boot/media/EFI/BOOT && \
-ln -s $1/1/EFI/BOOT/bootx64.efi $1/1/EFI/BOOT/grub.efi $2/boot/media/EFI/BOOT/
+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/
diff --git a/confluent_osdeploy/ubuntu20.04/profiles/default/initprofile.sh b/confluent_osdeploy/ubuntu20.04/profiles/default/initprofile.sh
index 2affa063..84b4124a 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/media/EFI/BOOT && \
-ln -s $1/EFI/BOOT/* $2/boot/media/EFI/BOOT/
+mkdir -p $2/boot/EFI/BOOT && \
+ln -s $1/EFI/BOOT/* $2/boot/EFI/BOOT/
 
diff --git a/confluent_server/confluent/discovery/protocols/pxe.py b/confluent_server/confluent/discovery/protocols/pxe.py
index b0918bc2..326430ed 100644
--- a/confluent_server/confluent/discovery/protocols/pxe.py
+++ b/confluent_server/confluent/discovery/protocols/pxe.py
@@ -437,7 +437,7 @@ def check_reply(node, info, packet, sock, cfg, reqview):
     repview[28:44] = reqview[28:44]  # copy chaddr field
     if httpboot:
         proto = 'https' if insecuremode == 'never' else 'http'
-        bootfile = '{0}://{1}/confluent-public/os/{2}/boot/boot.img'.format(
+        bootfile = '{0}://{1}/confluent-public/os/{2}/boot.img'.format(
             proto, info['netinfo']['recvip'], profile
         )
         if not isinstance(bootfile, bytes):