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

Jump to bottom

cmd-buildextend-live: always change EFI/{vendor} to correct vendor id #3048

Merged
merged 1 commit into from
Aug 31, 2022
Merged

cmd-buildextend-live: always change EFI/{vendor} to correct vendor id #3048

merged 1 commit into from
Aug 31, 2022

Conversation

HuijingHei
Copy link
Member

bgilbert
bgilbert reviewed Aug 26, 2022
View reviewed changes
src/cmd-buildextend-live Outdated Show resolved Hide resolved
@HuijingHei HuijingHei force-pushed the efi-distro branch 2 times, most recently from 1fc0a06 to 1132bd9 Compare August 29, 2022 13:38
@HuijingHei
Copy link
Member Author

Build c9s live iso locally, run uefi-secure test, result is passed.

$ kola testiso -S --qemu-firmware uefi-secure --scenarios iso-live-login --output-dir tmp/kola-uefi
Testing scenarios: [iso-live-login]
Ignoring verification of signature on metal image
PASS: iso-live-login (uefi-secure + metal) (45.829s)

[fedora@hhei c9s]$ sudo mount -o loop builds/412.91.202208291426-0/x86_64/scos-412.91.202208291426-0-live.x86_64.iso /mnt/iso/
mount: /mnt/iso: WARNING: source write-protected, mounted read-only.
[fedora@hhei c9s]$ ls /mnt/iso/EFI/centos/grub.cfg 
/mnt/iso/EFI/centos/grub.cfg
[fedora@hhei c9s]$ sudo mount -o loop,ro /mnt/iso/images/efiboot.img /mnt/efi/
[fedora@hhei c9s]$ tree /mnt/efi/
/mnt/efi/
└── EFI
    └── BOOT
        ├── BOOTX64.EFI
        ├── grub.cfg
        ├── grubx64.efi
        └── mmx64.efi

2 directories, 4 files

cgwalters
cgwalters previously approved these changes Aug 30, 2022
View reviewed changes
Copy link
Member

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! To be clear: I'm good to merge this as is to unblock C9S work, we can do my suggested tweaks as a followup too.

src/cmd-buildextend-live Outdated Show resolved Hide resolved
@cgwalters cgwalters enabled auto-merge (rebase) August 30, 2022 14:33
cgwalters
cgwalters previously approved these changes Aug 30, 2022
View reviewed changes
bgilbert
bgilbert reviewed Aug 30, 2022
View reviewed changes
Copy link
Contributor

@bgilbert bgilbert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for handling this!

src/cmd-buildextend-live Show resolved Hide resolved
@HuijingHei HuijingHei force-pushed the efi-distro branch 2 times, most recently from 3adc7af to c103d5e Compare August 31, 2022 06:08
@HuijingHei HuijingHei changed the title cmd-buildextend-live: update EFI/{distro}/grub.cfg to EFI/centos/grub.cfg for scos cmd-buildextend-live: always change EFI/{vendor} to correct vendor id Aug 31, 2022
bgilbert
bgilbert approved these changes Aug 31, 2022
View reviewed changes
Copy link
Contributor

@bgilbert bgilbert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@cgwalters cgwalters merged commit 3991e6f into coreos:main Aug 31, 2022
@HuijingHei HuijingHei deleted the efi-distro branch September 2, 2022 07:20
HuijingHei added a commit to HuijingHei/os that referenced this pull request Sep 2, 2022
@HuijingHei
Rename EFI/redhat dir to EFI/vendor
57d1d24 
Consider of building scos using centos stream, we want to make this
more flexiable to different ventor instead of fixed `redhat`. Change
with coreos-assember refer to coreos/coreos-assembler#3048
@HuijingHei HuijingHei mentioned this pull request Sep 2, 2022
Closed
travier pushed a commit to travier/os that referenced this pull request Sep 5, 2022
@HuijingHei @travier
Rename EFI/redhat dir to EFI/vendor
8d0770a 
Consider of building scos using centos stream, we want to make this
more flexiable to different ventor instead of fixed `redhat`. Change
with coreos-assember refer to coreos/coreos-assembler#3048
@travier travier mentioned this pull request Sep 5, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bgilbert bgilbert bgilbert approved these changes

@cgwalters cgwalters cgwalters left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

scos: testiso with uefi get grub terminal
3 participants
@HuijingHei @cgwalters @bgilbert