Skip to content

Commit

Permalink
change all efi/boot on the livecd to EFI/BOOT
Browse files Browse the repository at this point in the history
  • Loading branch information
pieroproietti committed Dec 2, 2024
1 parent dc5c995 commit 4d95d00
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 26 deletions.
15 changes: 0 additions & 15 deletions efiboot.sh

This file was deleted.

24 changes: 14 additions & 10 deletions src/classes/ovary.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1095,9 +1095,6 @@ export default class Ovary {
cmd = `mkdir -p ${this.settings.iso_work}boot/grub/${Utils.uefiFormat()}`
this.tryCatch(cmd)

cmd = `mkdir -p ${this.settings.iso_work}efi/boot`
this.tryCatch(cmd)

cmd = `mkdir -p ${this.settings.iso_work}isolinux`
this.tryCatch(cmd)

Expand Down Expand Up @@ -1198,8 +1195,10 @@ export default class Ovary {
await exec(`mkdir ${efiWorkDir}boot`, this.echo)
await exec(`mkdir ${efiWorkDir}boot/grub`, this.echo)
await exec(`mkdir ${efiWorkDir}boot/grub/${Utils.uefiFormat()}`, this.echo)
await exec(`mkdir ${efiWorkDir}efi`, this.echo)
await exec(`mkdir ${efiWorkDir}efi/boot`, this.echo)
// await exec(`mkdir ${efiWorkDir}efi`, this.echo)
// await exec(`mkdir ${efiWorkDir}efi/boot`, this.echo)
await exec(`mkdir ${efiWorkDir}EFI`, this.echo)
await exec(`mkdir ${efiWorkDir}EFI/BOOT`, this.echo)

/**
* copy splash to efiWorkDir
Expand Down Expand Up @@ -1277,7 +1276,8 @@ export default class Ovary {
// popd torna in efiWorkDir

// copy the grub image to efi/boot (to go later in the device's root)
await exec(`cp ${memdiskDir}/${Utils.uefiBN()} ${efiWorkDir}efi/boot`, this.echo)
// await exec(`cp ${memdiskDir}/${Utils.uefiBN()} ${efiWorkDir}efi/boot`, this.echo)
await exec(`cp ${memdiskDir}/${Utils.uefiBN()} ${efiWorkDir}EFI/BOOT`, this.echo)

// #######################

Expand All @@ -1290,11 +1290,14 @@ export default class Ovary {

await exec(`mount -o loop ${efiWorkDir}boot/grub/efiboot.img ${efiWorkDir}img-mnt`, this.echo)

await exec(`mkdir ${efiWorkDir}img-mnt/efi`, this.echo)
await exec(`mkdir ${efiWorkDir}img-mnt/efi/boot`, this.echo)
// await exec(`mkdir ${efiWorkDir}img-mnt/efi`, this.echo)
// await exec(`mkdir ${efiWorkDir}img-mnt/efi/boot`, this.echo)
await exec(`mkdir ${efiWorkDir}img-mnt/EFI`, this.echo)
await exec(`mkdir ${efiWorkDir}img-mnt/EFI/BOOT`, this.echo)

// era cp -r
await exec(`cp ${memdiskDir}/${Utils.uefiBN()} ${efiWorkDir}img-mnt/efi/boot`, this.echo)
//await exec(`cp ${memdiskDir}/${Utils.uefiBN()} ${efiWorkDir}img-mnt/efi/boot`, this.echo)
await exec(`cp ${memdiskDir}/${Utils.uefiBN()} ${efiWorkDir}img-mnt/EFI/BOOT`, this.echo)

// #######################

Expand Down Expand Up @@ -1323,7 +1326,8 @@ export default class Ovary {

// Copy efi files to iso
await exec(`rsync -avx ${efiWorkDir}boot ${isoDir}/`, this.echo)
await exec(`rsync -avx ${efiWorkDir}efi ${isoDir}/`, this.echo)
//await exec(`rsync -avx ${efiWorkDir}efi ${isoDir}/`, this.echo)
await exec(`rsync -avx ${efiWorkDir}EFI ${isoDir}/`, this.echo)

// Do the main grub.cfg (which gets loaded last):

Expand Down
2 changes: 1 addition & 1 deletion src/classes/utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ export default class Utils {
static uefiBN() {
let bn = 'nothing.efi'
if (process.arch === 'x64') {
bn = 'bootx64.efi'
bn = 'BOOTX64.EFI'
} else if (process.arch === 'arm64') {
bn = 'bootaa64.efi'
}
Expand Down

0 comments on commit 4d95d00

Please sign in to comment.