Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[13.4-stable] Simplify mkimage-iso-efi entrypoint script and its single consumer in… #4488

Merged
merged 1 commit into from
Dec 14, 2024
Merged

[13.4-stable] Simplify mkimage-iso-efi entrypoint script and its single consumer in… #4488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions pkg/eve/runme.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,17 @@ do_installer_raw() {
dump "$OUTPUT_IMG" installer.raw
}

# create_installer_iso creates the installer iso and leaves it as /output.iso
# common base for other usages like do_installer_iso and do_installer_net
create_installer_iso() {
mkdir -p /installer_root
unsquashfs -f -d /installer_root /bits/installer.img 1>&2
tar -C /installer_root -cf - . | /make-efi installer
rm -rf /installer_root
}

do_installer_iso() {
rm -rf /parts
/make-efi installer
create_installer_iso
dump /output.iso installer.iso
}

Expand All @@ -170,7 +178,7 @@ do_installer_net() {
cp /bits/ipxe.efi.cfg /installer
mkdir -p /installer/EFI/BOOT
cp /bits/EFI/BOOT/BOOT*EFI /installer/EFI/BOOT/
/make-efi installer
create_installer_iso
mv /output.iso /installer/installer.iso

# all of this is taken straight from ../../tools/makenet.sh
Expand Down
16 changes: 7 additions & 9 deletions pkg/mkimage-iso-efi/make-efi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,14 @@ copy() {
}

#
# Extract partitions from stdin or look them up in /bits
# Extract partitions from stdin to a working directory
# We could do this in /tmp, but it might be really big, and for cases where
# /tmp is tmpfs, that might use up a lot of memory
#
mkdir -p /parts 2>/dev/null || :
cd /parts
if [ -d /bits ]; then
ln -s /bits/* .
rm \* >/dev/null 2>&1 || :
else
bsdtar xzf -
fi
TMPDIR=/var/efiparts-$$
mkdir -p $TMPDIR
cd $TMPDIR
bsdtar xzf -

# create a ISO with a EFI boot partition
# Stuff it into a FAT filesystem, making it as small as possible. 511KiB
Expand Down
Loading