mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
update: fix commit 19108de408
(hopefully the last fix)
Origin commit data ------------------ Commit:c298cf3e38
Author: vanhofen <vanhofen@gmx.de> Date: 2018-12-01 (Sat, 01 Dec 2018) Origin message was: ------------------ - update: fix commit19108de408
(hopefully the last fix)
This commit is contained in:
@@ -123,7 +123,7 @@ CFlashUpdate::CFlashUpdate()
|
|||||||
sysfs = MTD_DEVICE_OF_UPDATE_PART;
|
sysfs = MTD_DEVICE_OF_UPDATE_PART;
|
||||||
dprintf(DEBUG_NORMAL, "[update] mtd partition to update: %s\n", sysfs.c_str());
|
dprintf(DEBUG_NORMAL, "[update] mtd partition to update: %s\n", sysfs.c_str());
|
||||||
notify = true;
|
notify = true;
|
||||||
gotImage = false;
|
gotImage = false; // NOTE: local update can't set gotImage variable!
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -583,7 +583,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey)
|
|||||||
|
|
||||||
dprintf(DEBUG_NORMAL, "[update] flash/install filename %s type %c\n", filename.c_str(), fileType);
|
dprintf(DEBUG_NORMAL, "[update] flash/install filename %s type %c\n", filename.c_str(), fileType);
|
||||||
|
|
||||||
if (gotImage && (fileType <= '9')) // flashing image
|
if (fileType <= '9') // flashing image
|
||||||
{
|
{
|
||||||
#if ENABLE_EXTUPDATE
|
#if ENABLE_EXTUPDATE
|
||||||
#ifndef BOXMODEL_CS_HD2
|
#ifndef BOXMODEL_CS_HD2
|
||||||
@@ -617,7 +617,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey)
|
|||||||
ft.reboot();
|
ft.reboot();
|
||||||
}
|
}
|
||||||
#if HAVE_ARM_HARDWARE
|
#if HAVE_ARM_HARDWARE
|
||||||
else if (gotImage && (fileType == 'Z')) // flashing image with ofgwrite
|
else if (fileType == 'Z') // flashing image with ofgwrite
|
||||||
{
|
{
|
||||||
showGlobalStatus(100);
|
showGlobalStatus(100);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user