mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

- try to fix path to /.version file

Browse Source 
Conflicts:
	src/gui/imageinfo.cpp
	src/gui/network_setup.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-12-06 13:32:20 +01:00
committed by Thilo Graf
parent ea64294d6a
commit cf67ca4cb6
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/imageinfo.cpp
View File

@@ -54,8 +54,6 @@
#include <nhttpd/yconfig.h>
#include <ctype.h>
#define VERSION_FILE "/.version"
#define OS_RELEASE_FILE "/usr/lib/os-release"
#define OE_IMAGE_VERSION_FILE "/etc/image-version"
@@ -305,7 +303,7 @@ void CImageInfo::InitInfoData()
config.clear();
}
config.loadConfig(VERSION_FILE);
config.loadConfig(IMAGE_VERSION_FILE);
string version_string = config.getString("version", "");
@@ -331,7 +329,7 @@ void CImageInfo::InitInfoData()
}else
version_string = oe_image_version;
}else
printf("[CImageInfo]\t[%s - %d], WARNING! %s contains possible wrong version format, content = [%s]\n", __func__, __LINE__, VERSION_FILE, version_string.c_str());
printf("[CImageInfo]\t[%s - %d], WARNING! %s contains possible wrong version format, content = [%s]\n", __func__, __LINE__, IMAGE_VERSION_FILE, version_string.c_str());
#endif
image_info_t imagename = {g_Locale->getText(LOCALE_IMAGEINFO_IMAGE), config.getString("imagename", PACKAGE_NAME)};