onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-05-01 22:57:33 +02:00
Code Issues Releases Wiki Activity

FW version needs to be introduced before use

Browse Source
This commit is contained in:
Rolf Fokkens 2015-03-29 00:19:32 +01:00
parent d3a4f36e97
commit 7041c92576
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/iptlib/CompilerDriver_ipt_run.cpp
View File

@ -678,7 +678,7 @@ QString CompilerDriver_ipt::run(const std::string &cluster_id,
script_buffer = "";
Configlet block_action(fw, "linux24", "block_action");
if (XMLTools::version_compare(version, "1.4.20") >= 0)
if (XMLTools::version_compare(fw_version, "1.4.20") >= 0)
block_action.setVariable("opt_wait", "-w");
else
block_action.setVariable("opt_wait", "");
@ -707,7 +707,7 @@ QString CompilerDriver_ipt::run(const std::string &cluster_id,
stop_action.setVariable("have_ipv4", have_ipv4);
stop_action.setVariable("have_ipv6", have_ipv6);
if (XMLTools::version_compare(version, "1.4.20") >= 0)
if (XMLTools::version_compare(fw_version, "1.4.20") >= 0)
stop_action.setVariable("opt_wait", "-w");
else
stop_action.setVariable("opt_wait", "");

1
src/iptlib/OSConfigurator_linux24.cpp
View File

@ -309,6 +309,7 @@ string OSConfigurator_linux24::printShellFunctions(bool have_ipv6)
QStringList output;
FWOptions* options = fw->getOptionsObject();
string version = fw->getStr("version");
// string host_os = fw->getStr("host_OS");
// string os_family = Resources::os_res[host_os]->
// getResourceStr("/FWBuilderResources/Target/family");