onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-15 09:29:36 +02:00
Code Issues Releases Wiki Activity

* FirewallInstaller.cpp (executeExternalInstallScript): see SF bug

Browse Source 
3212988 "external script makes getopt difficult". User-defined
parameters for the external script moved to the end of the command
line.
This commit is contained in:
Vadim Kurland
2011-04-07 10:41:06 -07:00
parent e541d4b1a1
commit c32da04d51
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/ChangeLog
+5
View File
@@ -1,5 +1,10 @@
2011-04-07 vadim <vadim@netcitadel.com>
* FirewallInstaller.cpp (executeExternalInstallScript): see SF bug
3212988 "external script makes getopt difficult". User-defined
parameters for the external script moved to the end of the command
line.
* res/os/fwsm_os.xml: updated filesystem path on FWSM where
fwbuilder built-in installer should place generated configuration
when it is installed using scp. Currently using path "flash:".
src/libgui/FirewallInstaller.cpp
+3 -2
View File
@@ -601,8 +601,6 @@ void FirewallInstaller::executeExternalInstallScript(const QString &command,
QStringList args;
//args.push_back(command.trimmed());
args += script_args.trimmed().split(" ", QString::SkipEmptyParts);
args.push_back("-f");
args.push_back(db->getFileName().c_str());
@@ -611,6 +609,9 @@ void FirewallInstaller::executeExternalInstallScript(const QString &command,
args.push_back("-d");
args.push_back(wdir);
}
args += script_args.trimmed().split(" ", QString::SkipEmptyParts);
args.push_back(cnf->fwobj->getName().c_str());
if (cnf->verbose) inst_dlg->displayCommand(args);