dasharo/dts-scripts
0
0
Fork 0
mirror of https://github.com/Dasharo/dts-scripts.git synced 2026-06-13 19:16:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

dasharo-deploy: create smmstore_migrate helper and reword question

Browse Source 
Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
This commit is contained in:
Michał Iwanicki
2025-09-24 11:16:29 +02:00
parent ef074a5655
commit 46836a4b1e
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/dts-functions.sh
+2 -2
View File
@@ -1588,7 +1588,7 @@ footer_options() {
# send_dts_logs_main [ask]
# Use send_dts_logs which calls this function.
# Create and upload archive with logs if SEND_LOGS_ACTIVE is true or first
# argument is "ask" and user confirms that he wants to send logs
# argument is "ask" and user confirms that they want to send logs
send_dts_logs_main() {
local ask="$1"
local send_logs="false"
@@ -1672,7 +1672,7 @@ send_dts_logs_main() {
# send_dts_logs [ask]
# Create and upload archive with logs if SEND_LOGS_ACTIVE is true or first
# argument is "ask" and user confirms that he wants to send logs
# argument is "ask" and user confirms that they want to send logs
send_dts_logs() {
local ask="$1"
if ! send_dts_logs_main "$@"; then
scripts/dasharo-deploy.sh
+15 -4
View File
@@ -633,13 +633,24 @@ smbios_migration() {
[[ "$_the_image_was_changed" == "true" ]] && return 0 || return 1
}
# smmstore_migrate
# helper function for smmstore_migration. Returns non-zero if any command failed
smmstore_migrate() {
$FLASHROM read_firm_mock -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} \
-r /tmp/dasharo_dump.rom ${FLASHROM_ADD_OPT_READ} --fmap -i FMAP \
-i SMMSTORE >>$FLASHROM_LOG_FILE 2>>$ERR_LOG_FILE &&
$CBFSTOOL read_smmstore_mock /tmp/dasharo_dump.rom read -r SMMSTORE \
-f /tmp/smmstore.bin >>$ERR_LOG_FILE 2>&1 &&
$CBFSTOOL write_smmstore_mock "$BIOS_UPDATE_FILE" write -r SMMSTORE \
-f /tmp/smmstore.bin -u >>$ERR_LOG_FILE 2>&1
}
smmstore_migration() {
echo -n "Backing up firmware configuration... "
if ! $FLASHROM read_firm_mock -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} -r /tmp/dasharo_dump.rom ${FLASHROM_ADD_OPT_READ} --fmap -i FMAP -i SMMSTORE >>$FLASHROM_LOG_FILE 2>>$ERR_LOG_FILE ||
! $CBFSTOOL read_smmstore_mock /tmp/dasharo_dump.rom read -r SMMSTORE -f /tmp/smmstore.bin >>$ERR_LOG_FILE 2>&1 ||
! $CBFSTOOL write_smmstore_mock "$BIOS_UPDATE_FILE" write -r SMMSTORE -f /tmp/smmstore.bin -u >>$ERR_LOG_FILE 2>&1; then
if ! smmstore_migrate; then
if ask_for_confirmation "Couldn't migrate BIOS configuration.
Do you want to continue update, which will result in restoring all BIOS configuration to default?"; then
Updating BIOS will result in all configuration being restored to default.
Do you want to continue update?"; then
print_warning "Continuing update without migrating BIOS configuration"
else
error_exit "Aborting..."