From c47375f672babf39d3d399c2971a14fc527feb4c Mon Sep 17 00:00:00 2001 From: Huy Le Anh Date: Fri, 6 Dec 2024 10:06:12 +0700 Subject: [PATCH] meta-ampere: webui: boot-option: remove oneTimeBootEnabled check 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]. https://github.com/openbmc/webui-vue/commit/918526f20c16a05c261a56814657942a707323dd [2]. https://discord.com/channels/775381525260664832/776550056391606352/1315550213535957002 Signed-off-by: Huy Le Anh --- ...tion-Remove-oneTimeBootEnabled-check.patch | 44 +++++++++++++++++++ .../webui/webui-vue_%.bbappend | 1 + 2 files changed, 45 insertions(+) create mode 100644 meta-ampere/meta-common/recipes-phosphor/webui/webui-vue/0009-Bios-Option-Remove-oneTimeBootEnabled-check.patch diff --git a/meta-ampere/meta-common/recipes-phosphor/webui/webui-vue/0009-Bios-Option-Remove-oneTimeBootEnabled-check.patch b/meta-ampere/meta-common/recipes-phosphor/webui/webui-vue/0009-Bios-Option-Remove-oneTimeBootEnabled-check.patch new file mode 100644 index 000000000000..03c05318baaf --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/webui/webui-vue/0009-Bios-Option-Remove-oneTimeBootEnabled-check.patch @@ -0,0 +1,44 @@ +From 236e31ddc4572442aaba9f5664902bcf1c224302 Mon Sep 17 00:00:00 2001 +From: Huy Le Anh +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 +--- + .../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 @@ + + + +- ++ + +-- +2.25.1 + diff --git a/meta-ampere/meta-common/recipes-phosphor/webui/webui-vue_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/webui/webui-vue_%.bbappend index aec71c80231d..2580fe583004 100644 --- a/meta-ampere/meta-common/recipes-phosphor/webui/webui-vue_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/webui/webui-vue_%.bbappend @@ -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 \ "