Move from bootctl to mokutil when checking for Secure Boot status #3486
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Yarden-Z
reviewed
Aug 13, 2024
Yarden-Z
reviewed
Aug 13, 2024
| @@ -93,7 +93,7 @@ function clear_lingering_reboot_config() | |||
| if [[ -f ${WARM_DIR}/${REDIS_FILE} ]]; then | |||
| mv -f ${WARM_DIR}/${REDIS_FILE} ${WARM_DIR}/${REDIS_FILE}.${TIMESTAMP} || /bin/true | |||
| fi | |||
| /sbin/kexec -u || /bin/true | |||
| /sbin/kexec -u -a || /bin/true | |||
There was a problem hiding this comment.
I have the same question. If this is valid and general bug fix, we need to evaluate the backport needs. Could you separate it into a standalone PR?
There was a problem hiding this comment.
kexec -u on systems with SB enabled is failing. Already fixed for WR here: #3439.
Since we are updating soft-reboot to work on Secure boot systems. i've also added this change
|
Could you link this PR to HLD PR? |
qiluo-msft
reviewed
Aug 13, 2024
| function load_kernel() { | ||
| # Load kernel into the memory | ||
| /sbin/kexec -l "$KERNEL_IMAGE" --initrd="$INITRD" --append="$BOOT_OPTIONS" | ||
| invoke_kexec -a |
There was a problem hiding this comment.
Similar to above comment.
ycoheNvidia
approved these changes
Aug 18, 2024
vivekrnv
approved these changes
Aug 19, 2024
|
@qiluo-msft can you please review comment feedback? |
qiluo-msft
approved these changes
Sep 9, 2024
mssonicbld
pushed a commit
to mssonicbld/sonic-utilities
that referenced
this pull request
Sep 17, 2024
…nic-net#3486) #### What I did Moved to use mokutil instead of bootctl as bootctl is no longer available in Bookworm. This affected reboot scripts, and upgrade scenario. #### How I did it Change calls to _bootctl status_ with _mokutil --sb-state_ #### How to verify it After fixing the scripts to check reboot: root@sn5600:/home/admin# soft-reboot SECURE_UPGRADE_ENABLED=1 [[ CHECK_SECURE_UPGRADE_ENABLED -ne 0 ]] load_kernel_secure invoke_kexec -s packet_write_wait: port 22: Broken pipe admin@sn5600:~$ show reboot-cause User issued 'soft-reboot' command [User: admin, Time: Tue Jul 23 11:06:43 PM UTC 2024]
|
Cherry-pick PR to 202405: #3545 |
mssonicbld
pushed a commit
that referenced
this pull request
Sep 17, 2024
) #### What I did Moved to use mokutil instead of bootctl as bootctl is no longer available in Bookworm. This affected reboot scripts, and upgrade scenario. #### How I did it Change calls to _bootctl status_ with _mokutil --sb-state_ #### How to verify it After fixing the scripts to check reboot: root@sn5600:/home/admin# soft-reboot SECURE_UPGRADE_ENABLED=1 [[ CHECK_SECURE_UPGRADE_ENABLED -ne 0 ]] load_kernel_secure invoke_kexec -s packet_write_wait: port 22: Broken pipe admin@sn5600:~$ show reboot-cause User issued 'soft-reboot' command [User: admin, Time: Tue Jul 23 11:06:43 PM UTC 2024]
mssonicbld
added
Included in 202405 Branch
and removed
Created PR to 202405 Branch
labels
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What I did
Moved to use mokutil instead of bootctl as bootctl is no longer available in Bookworm.
This affected reboot scripts, and upgrade scenario.
How I did it
Change calls to bootctl status with mokutil --sb-state
How to verify it
After fixing the scripts to check reboot:
root@sn5600:/home/admin# soft-reboot
SECURE_UPGRADE_ENABLED=1
[[ CHECK_SECURE_UPGRADE_ENABLED -ne 0 ]]
load_kernel_secure
invoke_kexec -s
packet_write_wait: port 22: Broken pipe
admin@sn5600:~$ show reboot-cause
User issued 'soft-reboot' command [User: admin, Time: Tue Jul 23 11:06:43 PM UTC 2024]
Previous command output (if the output of a command-line utility has changed)
New command output (if the output of a command-line utility has changed)