From 62778c923b0b748ab5a2f8fff61b3eeffead9a9e Mon Sep 17 00:00:00 2001 From: lgromero Date: Thu, 28 Nov 2024 15:41:19 +0100 Subject: [PATCH] refs #1200 #1201 adds new resource oglog to samba of ogboot, creates client_log in installation and adds timeout 0 to all grub.exe calls --- installer/ogboot_installer.py | 2 +- tftpboot/ipxe_scripts/templates/bootmark | 1 + tftpboot/ipxe_scripts/templates/firstDisk | 2 +- tftpboot/ipxe_scripts/templates/firstDisk_firstPartition | 2 +- tftpboot/ipxe_scripts/templates/firstDisk_secondPartition | 2 +- tftpboot/ipxe_scripts/templates/firstDisk_thirdPartition | 2 +- tftpboot/ipxe_scripts/templates/ogliveCache | 1 + 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/installer/ogboot_installer.py b/installer/ogboot_installer.py index 4717aa3..614676e 100755 --- a/installer/ogboot_installer.py +++ b/installer/ogboot_installer.py @@ -488,7 +488,7 @@ def copyClientFiles(): # Creamos el directorio de images para el samba de ogrepository os.makedirs(os.path.join(INSTALL_OGBOOT_TARGET, "client/images"), mode=0o775, exist_ok=True) # Creamos el directorio de logs para el samba de oglog - os.makedirs(os.path.join(INSTALL_OGBOOT_TARGET, "client/log"), mode=0o775, exist_ok=True) + os.makedirs(os.path.join(INSTALL_OGBOOT_TARGET, "client_log"), mode=0o775, exist_ok=True) # Change ownership of INSTALL_OGBOOT_TARGET/client/ and its contents subprocess.run(f"chown -R opengnsys:opengnsys {INSTALL_OGBOOT_TARGET}/client/", shell=True, text=True, capture_output=True) diff --git a/tftpboot/ipxe_scripts/templates/bootmark b/tftpboot/ipxe_scripts/templates/bootmark index 2e6de50..8fb2c0b 100644 --- a/tftpboot/ipxe_scripts/templates/bootmark +++ b/tftpboot/ipxe_scripts/templates/bootmark @@ -9,6 +9,7 @@ echo "Booting firstboot and secondboot flow using GRUB4DOS..." # Pasar control a GRUB4DOS para manejar firstboot y secondboot chain tftp://__SERVERIP__/tftpboot/grub.exe --config-file=" # Configurar ISODIR + timeout 0 set ISODIR=${ISODIR}; # Firstboot diff --git a/tftpboot/ipxe_scripts/templates/firstDisk b/tftpboot/ipxe_scripts/templates/firstDisk index 491c5a4..77af671 100644 --- a/tftpboot/ipxe_scripts/templates/firstDisk +++ b/tftpboot/ipxe_scripts/templates/firstDisk @@ -5,7 +5,7 @@ iseq ${platform} efi && goto uefi_boot || goto bios_boot :bios_boot echo "Running in BIOS mode - Booting first disk" -chain http://__SERVERIP__/tftpboot/grub.exe --config-file="title FirstHardDisk;chainloader (hd0)+1;rootnoverify (hd0);boot" || echo "Failed to boot in BIOS mode" +chain http://__SERVERIP__/tftpboot/grub.exe --config-file="timeout 0; title FirstHardDisk;chainloader (hd0)+1;rootnoverify (hd0);boot" || echo "Failed to boot in BIOS mode" exit :uefi_boot diff --git a/tftpboot/ipxe_scripts/templates/firstDisk_firstPartition b/tftpboot/ipxe_scripts/templates/firstDisk_firstPartition index fdbbe17..e4bb9d4 100644 --- a/tftpboot/ipxe_scripts/templates/firstDisk_firstPartition +++ b/tftpboot/ipxe_scripts/templates/firstDisk_firstPartition @@ -5,7 +5,7 @@ iseq ${platform} efi && goto uefi_boot || goto bios_boot :bios_boot echo "Running in BIOS mode - Booting first disk, first partition" -chain http://__SERVERIP__/tftpboot/grub.exe --config-file="title FirstHardDisk-FirstPartition;root (hd0,0);chainloader (hd0,0)+1;boot" || echo "Failed to boot in BIOS mode" +chain http://__SERVERIP__/tftpboot/grub.exe --config-file="timeout 0; title FirstHardDisk-FirstPartition;root (hd0,0);chainloader (hd0,0)+1;boot" || echo "Failed to boot in BIOS mode" exit :uefi_boot diff --git a/tftpboot/ipxe_scripts/templates/firstDisk_secondPartition b/tftpboot/ipxe_scripts/templates/firstDisk_secondPartition index e4d2691..a24f5ba 100644 --- a/tftpboot/ipxe_scripts/templates/firstDisk_secondPartition +++ b/tftpboot/ipxe_scripts/templates/firstDisk_secondPartition @@ -5,7 +5,7 @@ iseq ${platform} efi && goto uefi_boot || goto bios_boot :bios_boot echo "Running in BIOS mode - Booting first disk, second partition" -chain http://__SERVERIP__/tftpboot/grub.exe --config-file="title FirstHardDisk-SecondPartition;root (hd0,1);chainloader (hd0,1)+1;boot" || echo "Failed to boot in BIOS mode" +chain http://__SERVERIP__/tftpboot/grub.exe --config-file="timeout 0; title FirstHardDisk-SecondPartition;root (hd0,1);chainloader (hd0,1)+1;boot" || echo "Failed to boot in BIOS mode" exit :uefi_boot diff --git a/tftpboot/ipxe_scripts/templates/firstDisk_thirdPartition b/tftpboot/ipxe_scripts/templates/firstDisk_thirdPartition index 39e48c6..a1677d6 100644 --- a/tftpboot/ipxe_scripts/templates/firstDisk_thirdPartition +++ b/tftpboot/ipxe_scripts/templates/firstDisk_thirdPartition @@ -5,7 +5,7 @@ iseq ${platform} efi && goto uefi_boot || goto bios_boot :bios_boot echo "Running in BIOS mode - Booting first disk, third partition" -chain http://__SERVERIP__/tftpboot/grub.exe --config-file="title FirstHardDisk-ThirdPartition;root (hd0,2);chainloader (hd0,2)+1;boot" || echo "Failed to boot in BIOS mode" +chain http://__SERVERIP__/tftpboot/grub.exe --config-file="timeout 0; title FirstHardDisk-ThirdPartition;root (hd0,2);chainloader (hd0,2)+1;boot" || echo "Failed to boot in BIOS mode" exit :uefi_boot diff --git a/tftpboot/ipxe_scripts/templates/ogliveCache b/tftpboot/ipxe_scripts/templates/ogliveCache index 08fb3dd..035e69c 100644 --- a/tftpboot/ipxe_scripts/templates/ogliveCache +++ b/tftpboot/ipxe_scripts/templates/ogliveCache @@ -8,6 +8,7 @@ set kernelargs __INFOHOST__ echo "Booting ogLive from cache..." chain tftp://__SERVERIP__/tftpboot/grub.exe --config-file=" + timeout 0 set ISODIR=${ISODIR}; find --set-root --ignore-floppies --ignore-cd /boot/${ISODIR}/ogvmlinuz; kernel /boot/${ISODIR}/ogvmlinuz ${kernelargs};