From bddc4c6726189dfada4488cbf606ef30a45df8b5 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Fri, 20 Feb 2009 06:49:12 +0000 Subject: [PATCH] 2009-02-19 vadim * FirewallInstaller.cpp (FirewallInstaller::getDestinationDir): fixed bug #2618772 ""test install" option does not work". If "test install" checkbox was checked in the installer options dialog, the program copied file to directory /etc/fw on the firewall but tried to find it in /etc/fw/tmp to run. --- build_num | 2 +- doc/ChangeLog | 6 +++++ qmake.inc | 36 ++++++++++++++-------------- src/gui/FirewallInstaller.cpp | 41 ++++++++++++++++++++++++++++---- src/gui/FirewallInstaller.h | 1 + src/gui/FirewallInstallerUnx.cpp | 2 +- src/res/os/freebsd.xml | 14 ++++------- src/res/os/freebsd.xml.in | 14 ++++------- src/res/os/linksys.xml | 6 ++--- src/res/os/linksys.xml.in | 6 ++--- src/res/os/linux24.xml | 22 ++++------------- src/res/os/linux24.xml.in | 22 ++++------------- src/res/os/macosx.xml | 14 ++++------- src/res/os/macosx.xml.in | 14 ++++------- src/res/os/openbsd.xml | 14 ++++------- src/res/os/openbsd.xml.in | 14 ++++------- src/res/os/solaris.xml | 14 ++++------- src/res/os/solaris.xml.in | 14 ++++------- src/res/os/unknown_os.xml | 14 +++++++---- src/res/os/unknown_os.xml.in | 14 +++++++---- 20 files changed, 128 insertions(+), 156 deletions(-) diff --git a/build_num b/build_num index f3b27411c..0e2f84fe3 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 765 +#define BUILD_NUM 767 diff --git a/doc/ChangeLog b/doc/ChangeLog index 4ab551f63..ee9d35408 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,11 @@ 2009-02-19 vadim + * FirewallInstaller.cpp (FirewallInstaller::getDestinationDir): + fixed bug #2618772 ""test install" option does not work". If "test + install" checkbox was checked in the installer options dialog, the + program copied file to directory /etc/fw on the firewall but tried + to find it in /etc/fw/tmp to run. + * FirewallInstaller.cpp (FirewallInstaller::packSCPArgs): fix bug #2618686 "built-in installer can not handle ipv6 management address". Built-in installer did not properly for scp and ssh diff --git a/qmake.inc b/qmake.inc index b5f9be37b..286838457 100644 --- a/qmake.inc +++ b/qmake.inc @@ -11,15 +11,15 @@ SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@ DEFINES += $$(DEFINES) LANGUAGE = C++ UI_DIR = ui -MANDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/man/ -DOCDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.4 +MANDIR = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/man/ +DOCDIR = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.4 HAVE_ANTLR_RUNTIME = 1 HAVE_EXTERNAL_ANTLR = 0 unix { - ANTLR_INCLUDEPATH = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/ - ANTLR_LIBS = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a + ANTLR_INCLUDEPATH = /Users/vadim/src/fwbuilder/fwb3-branch-v3/source/fwbuilder/src/ + ANTLR_LIBS = /Users/vadim/src/fwbuilder/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a FWBPARSER_LIB = ../parsers/libfwbparser.a } @@ -30,38 +30,38 @@ unix { MOC_DIR = .moc OBJECTS_DIR = .obj - PREFIX = /home/vadim/src/fwb3-branch-v3/install_root + PREFIX = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root exec_prefix = @EXEC_PREFIX@ DESTDIR = - ICONSDIR = /home/vadim/src/fwb3-branch-v3/install_root/share//icons/hicolor/ + ICONSDIR = - INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2 + INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/include/ /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2 - LIBS_FWCOMPILER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -Wl,-Bsymbolic-functions -pthread -lfwcompiler -lfwbuilder -lz -lxslt -lxml2 -lnetsnmp - LIBS_FWBUILDER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -Wl,-Bsymbolic-functions -pthread -lfwbuilder -lz -lxslt -lxml2 -lnetsnmp + LIBS_FWCOMPILER = -L/Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp + LIBS_FWBUILDER = -L/Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp target.path = $$PREFIX/bin dtd.path = @TEMPLATE_DIR@/ migration.path = @TEMPLATE_DIR@/migration - doc.path = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.4 - datadir.path = /home/vadim/src/fwb3-branch-v3/install_root/share/ + doc.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.4 + datadir.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/ # win32:target.path = $$PREFIX/ # unix:target.path = $$PREFIX/share/fwbuilder/ # macx:target.path = $$PREFIX/ - res.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.4 - res_os.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.4/os/ - res_platform.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.4/platform/ - res_help.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.4/help/ - res_desktop.path = /home/vadim/src/fwb3-branch-v3/install_root/share//applications/ + res.path = ../Resources + res_os.path = ../Resources/os/ + res_platform.path = ../Resources/platform/ + res_help.path = ../Resources/help/ + res_desktop.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share//applications/ INSTALLS += res INSTALLS += res_os INSTALLS += res_platform # INSTALLS += icns - LIBS += $$LIBS_FWBUILDER -lutil + LIBS += $$LIBS_FWBUILDER -L/sw/lib -lpoll PKGLOCALEDIR = $$res.path/locale @@ -74,7 +74,7 @@ unix { } macx { - PREFIX = /home/vadim/src/fwb3-branch-v3/install_root + PREFIX = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root } win32 { diff --git a/src/gui/FirewallInstaller.cpp b/src/gui/FirewallInstaller.cpp index 5ca7878f3..78bb2de3a 100644 --- a/src/gui/FirewallInstaller.cpp +++ b/src/gui/FirewallInstaller.cpp @@ -166,11 +166,17 @@ void FirewallInstaller::packSCPArgs(const QString &file_name, ; } + // bug #2618772: "test install" option does not work. To fix, I + // put macro for the temp dir. in in res/os/host_os.xml XML + // elements root/test/copy reg_user/test/copy. That macro + // is read and processed by getDestinationDir() + + QString dest_dir = getDestinationDir(); if (!cnf->user.isEmpty()) - args.push_back(cnf->user + "@" + mgmt_addr + ":" + cnf->fwdir); + args.push_back(cnf->user + "@" + mgmt_addr + ":" + dest_dir); else - args.push_back(mgmt_addr + ":" + cnf->fwdir); + args.push_back(mgmt_addr + ":" + dest_dir); } /* @@ -278,9 +284,9 @@ QString FirewallInstaller::getActivationCmd() return cnf->activationCmd; } - QString cmd=""; + QString cmd = ""; - string optpath="activation/"; + string optpath = "activation/"; if (cnf->user=="root") optpath += "root/"; else optpath += "reg_user/"; @@ -302,6 +308,33 @@ QString FirewallInstaller::getActivationCmd() return inst_dlg->replaceMacrosInCommand(cmd); } +QString FirewallInstaller::getDestinationDir() +{ + if (!cnf->activationCmd.isEmpty()) + { + return cnf->activationCmd; + } + + QString dir = ""; + + string optpath = "activation/"; + + if (cnf->user=="root") optpath += "root/"; + else optpath += "reg_user/"; + + if (cnf->testRun) optpath += "test/copy/"; + else optpath += "run/copy/"; + + dir = Resources::getTargetOptionStr(cnf->fwobj->getStr("host_OS"), + optpath).c_str(); + // need to trim dir because it picks up '\n' and possibly spaces + // from XML element body text formatting + dir = dir.trimmed(); + if (dir.isEmpty()) return cnf->fwdir; + if (!dir.endsWith('/')) dir = dir + "/"; + return inst_dlg->replaceMacrosInCommand(dir); +} + QString FirewallInstaller::getGeneratedFileFullPath(Firewall *fw) { /* bug #1617501: "Install fails after compile". The "output file" diff --git a/src/gui/FirewallInstaller.h b/src/gui/FirewallInstaller.h index d3d431adc..21927c427 100644 --- a/src/gui/FirewallInstaller.h +++ b/src/gui/FirewallInstaller.h @@ -92,6 +92,7 @@ public: void packSSHArgs(QStringList &args); void packSCPArgs(const QString &file_name, QStringList &args); QString getActivationCmd(); + QString getDestinationDir(); virtual bool packInstallJobsList(libfwbuilder::Firewall*); virtual void copyFile(const QString &file_name); diff --git a/src/gui/FirewallInstallerUnx.cpp b/src/gui/FirewallInstallerUnx.cpp index 8a05d4cb7..afc358ffe 100644 --- a/src/gui/FirewallInstallerUnx.cpp +++ b/src/gui/FirewallInstallerUnx.cpp @@ -227,7 +227,7 @@ void FirewallInstallerUnx::copyFile(const QString &file_name) QString file_with_path = getFullPath(file_name); inst_dlg->addToLog( tr("Copying %1 -> %2:%3\n") .arg(QString::fromUtf8(file_with_path.toAscii().constData())) - .arg(cnf->maddr).arg(cnf->fwdir)); + .arg(cnf->maddr).arg(getDestinationDir())); if (cnf->verbose) inst_dlg->displayCommand(args); qApp->processEvents(); diff --git a/src/res/os/freebsd.xml b/src/res/os/freebsd.xml index deea82102..37e08f27c 100644 --- a/src/res/os/freebsd.xml +++ b/src/res/os/freebsd.xml @@ -22,8 +22,7 @@ -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -40,9 +39,7 @@ sudo -S %FWDIR%/%FWSCRIPT% && sudo -S pkill shutdown; echo 'Policy activ -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp @@ -62,8 +59,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% && echo 'Policy activated' -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -78,9 +74,7 @@ sh %FWDIR%/%FWSCRIPT% && pkill shutdown; echo 'Policy activated' -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp diff --git a/src/res/os/freebsd.xml.in b/src/res/os/freebsd.xml.in index 9faa54e37..0eed67361 100644 --- a/src/res/os/freebsd.xml.in +++ b/src/res/os/freebsd.xml.in @@ -22,8 +22,7 @@ -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -40,9 +39,7 @@ sudo -S %FWDIR%/%FWSCRIPT% && sudo -S pkill shutdown; echo 'Policy activ -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp @@ -62,8 +59,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% && echo 'Policy activated' -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -78,9 +74,7 @@ sh %FWDIR%/%FWSCRIPT% && pkill shutdown; echo 'Policy activated' -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp diff --git a/src/res/os/linksys.xml b/src/res/os/linksys.xml index b96100a21..874d443ca 100644 --- a/src/res/os/linksys.xml +++ b/src/res/os/linksys.xml @@ -25,8 +25,7 @@ -echo '%FWBPROMPT%'; -cat > /tmp/%FWSCRIPT% +/tmp/ @@ -63,8 +62,7 @@ echo "Activating policy"; -echo '%FWBPROMPT%'; -cat > /tmp/%FWSCRIPT% +/tmp/ diff --git a/src/res/os/linksys.xml.in b/src/res/os/linksys.xml.in index d8548915c..3f34e6c84 100644 --- a/src/res/os/linksys.xml.in +++ b/src/res/os/linksys.xml.in @@ -25,8 +25,7 @@ -echo '%FWBPROMPT%'; -cat > /tmp/%FWSCRIPT% +/tmp/ @@ -63,8 +62,7 @@ echo "Activating policy"; -echo '%FWBPROMPT%'; -cat > /tmp/%FWSCRIPT% +/tmp/ diff --git a/src/res/os/linux24.xml b/src/res/os/linux24.xml index f1f88f607..d65350651 100644 --- a/src/res/os/linux24.xml +++ b/src/res/os/linux24.xml @@ -23,10 +23,7 @@ -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT% && -chmod +x %FWDIR%/%FWSCRIPT%; -echo Done; +%FWDIR% @@ -43,11 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% && ( which pkill > /dev/null && sudo -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT% && -chmod +x %FWDIR%/tmp/%FWSCRIPT%; -echo Done; +%FWDIR%/tmp @@ -67,10 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% && echo 'Policy activated' -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT% && -chmod +x %FWDIR%/%FWSCRIPT%; -echo Done; +%FWDIR% @@ -85,11 +75,7 @@ sh %FWDIR%/%FWSCRIPT% && ( which pkill > /dev/null && pkill shut -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT% && -chmod +x %FWDIR%/tmp/%FWSCRIPT%; -echo Done; +%FWDIR%/tmp diff --git a/src/res/os/linux24.xml.in b/src/res/os/linux24.xml.in index 8bdbe2404..a5afd5f2c 100644 --- a/src/res/os/linux24.xml.in +++ b/src/res/os/linux24.xml.in @@ -23,10 +23,7 @@ -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT% && -chmod +x %FWDIR%/%FWSCRIPT%; -echo Done; +%FWDIR% @@ -43,11 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% && ( which pkill > /dev/null && sudo -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT% && -chmod +x %FWDIR%/tmp/%FWSCRIPT%; -echo Done; +%FWDIR%/tmp @@ -67,10 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% && echo 'Policy activated' -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT% && -chmod +x %FWDIR%/%FWSCRIPT%; -echo Done; +%FWDIR% @@ -85,11 +75,7 @@ sh %FWDIR%/%FWSCRIPT% && ( which pkill > /dev/null && pkill shut -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT% && -chmod +x %FWDIR%/tmp/%FWSCRIPT%; -echo Done; +%FWDIR%/tmp diff --git a/src/res/os/macosx.xml b/src/res/os/macosx.xml index 10d83d0f7..3c40012c2 100644 --- a/src/res/os/macosx.xml +++ b/src/res/os/macosx.xml @@ -23,8 +23,7 @@ -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -41,9 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% && (ps ax|awk '/shutdown/ && !/awk/ { -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp @@ -63,8 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% && echo 'Policy activated' -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -79,9 +75,7 @@ sh %FWDIR%/%FWSCRIPT% && (ps ax|awk '/shutdown/ && \!/awk/ {prin -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp diff --git a/src/res/os/macosx.xml.in b/src/res/os/macosx.xml.in index ade224b48..d78a129e5 100644 --- a/src/res/os/macosx.xml.in +++ b/src/res/os/macosx.xml.in @@ -23,8 +23,7 @@ -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -41,9 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% && (ps ax|awk '/shutdown/ && !/awk/ { -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp @@ -63,8 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% && echo 'Policy activated' -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -79,9 +75,7 @@ sh %FWDIR%/%FWSCRIPT% && (ps ax|awk '/shutdown/ && \!/awk/ {prin -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp diff --git a/src/res/os/openbsd.xml b/src/res/os/openbsd.xml index 744326d69..29d6a15b5 100644 --- a/src/res/os/openbsd.xml +++ b/src/res/os/openbsd.xml @@ -23,8 +23,7 @@ -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -41,9 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% && sudo -S pkill shutdown; echo 'Policy activ -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp @@ -63,8 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% && echo 'Policy activated' -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -79,9 +75,7 @@ sh %FWDIR%/%FWSCRIPT% && pkill shutdown; echo 'Policy activated' -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp diff --git a/src/res/os/openbsd.xml.in b/src/res/os/openbsd.xml.in index 3e24ab619..16c856ebe 100644 --- a/src/res/os/openbsd.xml.in +++ b/src/res/os/openbsd.xml.in @@ -23,8 +23,7 @@ -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -41,9 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% && sudo -S pkill shutdown; echo 'Policy activ -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp @@ -63,8 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% && echo 'Policy activated' -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -79,9 +75,7 @@ sh %FWDIR%/%FWSCRIPT% && pkill shutdown; echo 'Policy activated' -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp diff --git a/src/res/os/solaris.xml b/src/res/os/solaris.xml index 1a9f31f92..483d8e48c 100644 --- a/src/res/os/solaris.xml +++ b/src/res/os/solaris.xml @@ -23,8 +23,7 @@ -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -41,9 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% && sudo -S pkill shutdown; echo 'Policy activ -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp @@ -63,8 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% && echo 'Policy activated' -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -79,9 +75,7 @@ sh %FWDIR%/%FWSCRIPT% && pkill shutdown; echo 'Policy activated' -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp diff --git a/src/res/os/solaris.xml.in b/src/res/os/solaris.xml.in index 5b230c3da..056ac2f4e 100644 --- a/src/res/os/solaris.xml.in +++ b/src/res/os/solaris.xml.in @@ -23,8 +23,7 @@ -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -41,9 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% && sudo -S pkill shutdown; echo 'Policy activ -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp @@ -63,8 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% && echo 'Policy activated' -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -79,9 +75,7 @@ sh %FWDIR%/%FWSCRIPT% && pkill shutdown; echo 'Policy activated' -echo '%FWBPROMPT%'; -mkdir -p %FWDIR%/tmp; -cat > %FWDIR%/tmp/%FWSCRIPT%; +%FWDIR%/tmp diff --git a/src/res/os/unknown_os.xml b/src/res/os/unknown_os.xml index 83a7884a2..8bab5ec2c 100644 --- a/src/res/os/unknown_os.xml +++ b/src/res/os/unknown_os.xml @@ -20,8 +20,7 @@ -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -38,6 +37,10 @@ sudo -S %FWDIR%/%FWSCRIPT% && (sudo -S ps ax|awk '/shutdown/ && + +%FWDIR%/tmp + + echo '%FWBPROMPT%'; chmod +x /tmp/%FWSCRIPT%; @@ -54,8 +57,7 @@ sudo -S /tmp/%FWSCRIPT% && echo 'Policy activated' -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -70,6 +72,10 @@ sh %FWDIR%/%FWSCRIPT% && (ps ax|awk '/shutdown/ && \!/awk/ {prin + +%FWDIR%/tmp + + echo '%FWBPROMPT%'; /sbin/shutdown -r +%RBTIMEOUT%; diff --git a/src/res/os/unknown_os.xml.in b/src/res/os/unknown_os.xml.in index cbb52c9ad..a93c0c329 100644 --- a/src/res/os/unknown_os.xml.in +++ b/src/res/os/unknown_os.xml.in @@ -20,8 +20,7 @@ -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -38,6 +37,10 @@ sudo -S %FWDIR%/%FWSCRIPT% && (sudo -S ps ax|awk '/shutdown/ && + +%FWDIR%/tmp + + echo '%FWBPROMPT%'; chmod +x /tmp/%FWSCRIPT%; @@ -54,8 +57,7 @@ sudo -S /tmp/%FWSCRIPT% && echo 'Policy activated' -echo '%FWBPROMPT%'; -cat > %FWDIR%/%FWSCRIPT%; +%FWDIR% @@ -70,6 +72,10 @@ sh %FWDIR%/%FWSCRIPT% && (ps ax|awk '/shutdown/ && \!/awk/ {prin + +%FWDIR%/tmp + + echo '%FWBPROMPT%'; /sbin/shutdown -r +%RBTIMEOUT%;