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

[secure boot]Fix mokutil check issue with ONIE version older than 202… #14589

Merged
merged 6 commits into from
May 31, 2023
Merged

[secure boot]Fix mokutil check issue with ONIE version older than 202… #14589

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
29cdac1
[secure boot]Fix mokutil check issue with ONIE version older than 202…
davidpil2002 Apr 10, 2023
81d0874
[secure boot]define a MACRO for enable state
davidpil2002 Apr 13, 2023
67051ff
[secure boot]Made the condition of secure boot state more safe
davidpil2002 Apr 14, 2023
b4807e4
[secure boot]Fix lower case print
davidpil2002 Apr 19, 2023
1130eff
[secure boot]Fix Grub linuxefi call issue, by using this cmd only in …
davidpil2002 Apr 23, 2023
c48f111
secure boot: add delimiter to reggex
davidpil2002 May 7, 2023
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
17 changes: 13 additions & 4 deletions installer/default_platform.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,13 +435,22 @@ bootloader_menu_config()
mv $onie_initrd_tmp/tmp/onie-support*.tar.bz2 $demo_mnt/$image_dir/

if [ "$firmware" = "uefi" ] ; then
secure_boot_state=$(mokutil --sb-state)
secure_boot_state=""
reg_sb_guid=""
ENABLED=1
reg_sb_guid=$(efivar -l | grep "SecureBoot")
if echo "$reg_sb_guid" | grep -q "SecureBoot";then
secure_boot_state=$(efivar -d --name $reg_sb_guid)
else
echo "Current UEFI do not support Secure Boot feature"
secure_boot_state="0"
fi
echo secure_boot_state=$secure_boot_state
if [ "$secure_boot_state" = "SecureBoot enabled" ]; then
echo "UEFI Secure Boot is enabled"
if [ "$secure_boot_state" -eq "$ENABLED" ]; then
echo "UEFI Secure Boot is enabled - Installing shim bootloader"
demo_install_uefi_shim "$demo_mnt" "$blk_dev"
else
echo "UEFI Secure Boot is disabled"
echo "UEFI Secure Boot is disabled - installing regular grub bootloader"
Copy link
Collaborator

@qiluo-msft qiluo-msft Apr 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

installing

Minor comment: the cases are not consistent.
Installing vs installing #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

DONE

demo_install_uefi_grub "$demo_mnt" "$blk_dev"
fi
else
Expand Down