Skip to content
This repository has been archived by the owner on Apr 22, 2024. It is now read-only.

feat: Add Test Media Capability #43

Merged
merged 25 commits into from
Feb 28, 2024
Merged

feat: Add Test Media Capability #43

Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
cb88bb6
feat: Allow users to override secure boot key and password when using…
noelmiller Feb 27, 2024
1f1878f
fix: follow redirects
noelmiller Feb 27, 2024
ff1b64e
chore: update docs
noelmiller Feb 27, 2024
4b4d9c9
fix: added comments and removed additional \n
noelmiller Feb 27, 2024
3aac0b6
fix: removed defaults
noelmiller Feb 27, 2024
ba04e86
fix: added conditional for adding public key
noelmiller Feb 27, 2024
9d2fb9c
chore(ci): Added additional test for secure boot
noelmiller Feb 27, 2024
66e0be5
chore(ci): fixed up workflows to match production
noelmiller Feb 27, 2024
88fcc40
fix(ci): added workflow dispatch to test
noelmiller Feb 27, 2024
7702beb
fix(ci): fixed version and added IMAGE_TAG
noelmiller Feb 27, 2024
b5d3305
chore(ci): changed to bluefin to test both 38 and 39 secure boot
noelmiller Feb 27, 2024
8840ff3
Merge branch 'main' into decouple_secure_boot_key
noelmiller Feb 27, 2024
bf9ced7
chore(ci): added required variables to entrypoint
noelmiller Feb 27, 2024
eacb536
chore(ci): added merge_group and added paths-ignore
noelmiller Feb 27, 2024
dbe636a
chore(ci): updated description
noelmiller Feb 27, 2024
e9c5721
chore(ci): set to Silverblue since we are testing Bluefin
noelmiller Feb 27, 2024
ecce977
chore(ci): Fixed secure boot key not found error
noelmiller Feb 27, 2024
fc78338
chore: fixed formatting
noelmiller Feb 27, 2024
f62869b
chore: fixed whitespace
noelmiller Feb 27, 2024
00b5de4
chore(ci): Removed duplicate test
noelmiller Feb 27, 2024
4dbeef1
chore: fix whitespace
noelmiller Feb 27, 2024
83a7deb
chore(ci): fixed test and removed upload to Github Artifacts
noelmiller Feb 27, 2024
8244641
chore: updated README
noelmiller Feb 27, 2024
940e5d5
feat: Re-enable Test Media Feature
noelmiller Feb 27, 2024
4f2bcd5
Merge branch 'main' into add_test_media_capability
noelmiller Feb 28, 2024
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
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ $(IMAGE_NAME)-$(IMAGE_TAG).iso: output/$(IMAGE_NAME)-$(IMAGE_TAG).iso
output/$(IMAGE_NAME)-$(IMAGE_TAG).iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
mkdir $(_BASE_DIR)/output || true
xorriso -dialog on < $(_BASE_DIR)/xorriso/input.txt
implantisomd5 $(_BASE_DIR)/output/$(IMAGE_NAME)-$(IMAGE_TAG).iso

# Step 1: Generate Lorax Templates
lorax_templates/%.tmpl: lorax_templates/%.tmpl.in
Expand All @@ -60,10 +61,6 @@ boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.
curl --fail -L -o $(_BASE_DIR)/sb_pubkey.der $(SECURE_BOOT_KEY_URL);\
fi

# Remove the "Test this media & install" menu entry
sed -i '/menuentry '\''Test this media & install @PRODUCT@ @VERSION@'\'' --class fedora --class gnu-linux --class gnu --class os {/,/}/d' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-bios.cfg
sed -i '/menuentry '\''Test this media & install @PRODUCT@ @VERSION@'\'' --class fedora --class gnu-linux --class gnu --class os {/,/}/d' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-efi.cfg

# Set the default menu entry to the first one
sed -i 's/set default="1"/set default="0"/' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-bios.cfg
sed -i 's/set default="1"/set default="0"/' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-efi.cfg
Expand All @@ -72,6 +69,9 @@ boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.
sed -i 's/linux @KERNELPATH@ @ROOT@ quiet/linux @KERNELPATH@ @ROOT@ quiet $(EXTRA_BOOT_PARAMS)/g' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-bios.cfg
sed -i 's/linuxefi @KERNELPATH@ @ROOT@ quiet/linuxefi @KERNELPATH@ @ROOT@ quiet $(EXTRA_BOOT_PARAMS)/g' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-efi.cfg

sed -i 's/linux @KERNELPATH@ @ROOT@ rd.live.check quiet/linux @KERNELPATH@ @ROOT@ rd.live.check quiet $(EXTRA_BOOT_PARAMS)/g' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-bios.cfg
sed -i 's/linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet/linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet $(EXTRA_BOOT_PARAMS)/g' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-efi.cfg

sed -i 's/linux @KERNELPATH@ @ROOT@ nomodeset quiet/linux @KERNELPATH@ @ROOT@ nomodeset quiet $(EXTRA_BOOT_PARAMS)/g' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-bios.cfg
sed -i 's/linuxefi @KERNELPATH@ @ROOT@ nomodeset quiet/linuxefi @KERNELPATH@ @ROOT@ nomodeset quiet $(EXTRA_BOOT_PARAMS)/g' /usr/share/lorax/templates.d/99-generic/config_files/x86/grub2-efi.cfg

Expand Down
Loading