xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-25 11:01:09 +00:00
Code Issues Projects Releases Wiki Activity

Move media content out of subdirectory

Browse Source 
This paves the way for a consistent organization of boot
media
and network based boot.
This commit is contained in:
Jarrod Johnson 2020-05-07 09:32:11 -04:00
parent dcdd453112
commit 4f2d4a7709
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
confluent_osdeploy/el8/profiles/default/initprofile.sh
View File

@ -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/

9
confluent_osdeploy/suse15/profiles/default/initprofile.sh
View File

@ -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/

4
confluent_osdeploy/ubuntu20.04/profiles/default/initprofile.sh
View File

@ -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/

2
confluent_server/confluent/discovery/protocols/pxe.py
View File

@ -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):