Skip to content

Commit

Permalink
meta-ampere: webui: boot-option: remove oneTimeBootEnabled check
Browse files Browse the repository at this point in the history
At commit [1], the condition oneTimeBootEnabled was added, causing
BootSettings to only be displayed when oneTimeBootEnabled is true. The
root cause of this behavior is currently under investigation at [2]. For
now, the oneTimeBootEnabled condition check will not be used until the
issue is clarified.

Tested:
 1. Log in to BMC Web and go to the server-power-operations page
 2. The boot settings options are shown.

[1].
openbmc/webui-vue@918526f
[2].
https://discord.com/channels/775381525260664832/776550056391606352/1315550213535957002

Signed-off-by: Huy Le Anh <[email protected]>
  • Loading branch information
HuyLeAnh authored and Nhat Hieu Le committed Feb 12, 2025
1 parent 0f98274 commit c47375f
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
From 236e31ddc4572442aaba9f5664902bcf1c224302 Mon Sep 17 00:00:00 2001
From: Huy Le Anh <[email protected]>
Date: Mon, 9 Dec 2024 11:30:58 +0700
Subject: [PATCH] Bios Option: Remove oneTimeBootEnabled check

At commit [1], the condition oneTimeBootEnabled was added, causing
BootSettings to only be displayed when oneTimeBootEnabled is true.
This is incorrect, so this commit removes the condition check for
oneTimeBootEnabled to ensure the Bios Option is alway displayed by
default.

Tested:
1. Log in to BMC Web and go to the server-power-operations page
2. The boot settings options are shown.

[1].
https://github.com/openbmc/webui-vue/commit/918526f20c16a05c261a56814657942a707323dd

Signed-off-by: Huy Le Anh <[email protected]>
---
.../ServerPowerOperations/ServerPowerOperations.vue | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue
index 9c36f24..491dc7f 100644
--- a/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue
+++ b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue
@@ -55,12 +55,7 @@
</b-col>
</b-row>
<b-row>
- <b-col
- v-if="hasBootSourceOptions && oneTimeBootEnabled"
- sm="8"
- md="6"
- xl="4"
- >
+ <b-col v-if="hasBootSourceOptions" sm="8" md="6" xl="4">
<page-section
:section-title="$t('pageServerPowerOperations.serverBootSettings')"
>
--
2.25.1

Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ SRC_URI += "\
file://0006-Use-the-createWebHashHistory-method-to-avoid-404-err.patch \
file://0007-Parsing-string-arguments-for-Account-policy-settings.patch \
file://0008-Fix-date-time-format-regex-check.patch \
file://0009-Bios-Option-Remove-oneTimeBootEnabled-check.patch \
"

0 comments on commit c47375f

Please sign in to comment.