From 0face95c6e6d6b1ad4b5ca9590cda4a73150ce6c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 22 Nov 2020 21:07:41 +0100 Subject: [PATCH] update: fix new partition for hd6x using g_info.hw_caps->startup_file Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a61759855f4f6a38c4d9e069786e4bf7a4562c38 Author: vanhofen Date: 2020-11-22 (Sun, 22 Nov 2020) Origin message was: ------------------ - update: fix new partition for hd6x using g_info.hw_caps->startup_file ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/update.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 389ff961c..98dfc0d9f 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -708,11 +708,13 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey) if(g_settings.hdmi_cec_standby){ videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)0); } - std::string startup_new = "/boot/STARTUP_" + to_string(selected); + std::string startup_file("/boot/"); + startup_file += g_info.hw_caps->startup_file; + std::string startup_new = startup_file + "_" + to_string(selected); dprintf(DEBUG_NORMAL, "[update] Start selected partition %d (%s)\n", selected, startup_new.c_str()); #ifndef DRYRUN CFileHelpers fh; - fh.copyFile(startup_new.c_str(), "/boot/STARTUP"); + fh.copyFile(startup_new.c_str(), startup_file.c_str()); #endif } } else if (selected > 0 && strcmp(c, to_string(selected).c_str()) == 0) {