summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorjoe2011-04-20 18:43:57 +0200
committerjoe2011-04-20 18:43:57 +0200
commit8c3956a644a4983f5108802dc89662ebb4a1ebc1 (patch)
treec102bf70b58f26f62e8d6cdbbff03c12bb4ef88b /src/main.cpp
parentfbgui.conf update (diff)
downloadfbgui-8c3956a644a4983f5108802dc89662ebb4a1ebc1.tar.gz
fbgui-8c3956a644a4983f5108802dc89662ebb4a1ebc1.tar.xz
fbgui-8c3956a644a4983f5108802dc89662ebb4a1ebc1.zip
kexec done by fbgui
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 0e7957c..5f15d39 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -167,9 +167,16 @@ int main(int argc, char *argv[]) {
else
serialLocation = QString("/serial"); // tests
+ // save ip config location (file generated by uchpc)
+ if (confFileSettings.contains("default/ip_config"))
+ ipConfigFilePath = confFileSettings.value("default/ip_config").toString();
+ //else
+ // ipConfigFilePath = QString("/tmp/ip_config");
+
// print config
qxtLog->debug() << "************* CONFIG INFO *************";
qxtLog->debug() << "configFilePath: " << configFilePath.toUtf8();
+ qxtLog->debug() << "ipConfigFilePath:" << ipConfigFilePath.toUtf8();
qxtLog->debug() << "baseURL: " << baseURL.toString().toUtf8();
qxtLog->debug() << "downloadDir : " << downloadPath.toUtf8();
qxtLog->debug() << "trigger: " << fileToTriggerURL.toUtf8();