onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-22 19:27:13 +01:00
Code Issues Releases Wiki Activity

2009-02-19 vadim <vadim@vk.crocodile.org>

Browse Source 
* 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.
This commit is contained in:
Vadim Kurland 2009-02-20 06:49:12 +00:00
parent 6a0e4d9f58
commit bddc4c6726
20 changed files with 128 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 765
#define BUILD_NUM 767

6
doc/ChangeLog
View File

@ -1,5 +1,11 @@
2009-02-19 vadim <vadim@vk.crocodile.org>
* 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

36
qmake.inc
View File

@ -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 {

41
src/gui/FirewallInstaller.cpp
View File

@ -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"

1
src/gui/FirewallInstaller.h
View File

@ -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);

2
src/gui/FirewallInstallerUnx.cpp
View File

@ -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();

14
src/res/os/freebsd.xml
View File

@ -22,8 +22,7 @@
<reg_user>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -40,9 +39,7 @@ sudo -S %FWDIR%/%FWSCRIPT% &#38;&#38; sudo -S pkill shutdown; echo 'Policy activ
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>
@ -62,8 +59,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<root>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -78,9 +74,7 @@ sh %FWDIR%/%FWSCRIPT% &#38;&#38; pkill shutdown; echo 'Policy activated'
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>

14
src/res/os/freebsd.xml.in
View File

@ -22,8 +22,7 @@
<reg_user>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -40,9 +39,7 @@ sudo -S %FWDIR%/%FWSCRIPT% &#38;&#38; sudo -S pkill shutdown; echo 'Policy activ
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>
@ -62,8 +59,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<root>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -78,9 +74,7 @@ sh %FWDIR%/%FWSCRIPT% &#38;&#38; pkill shutdown; echo 'Policy activated'
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>

6
src/res/os/linksys.xml
View File

@ -25,8 +25,7 @@
<root>
<run>
<copy>
echo '%FWBPROMPT%';
cat > /tmp/%FWSCRIPT%
/tmp/
</copy>
<compression>
@ -63,8 +62,7 @@ echo "Activating policy";
<test>
<copy>
echo '%FWBPROMPT%';
cat > /tmp/%FWSCRIPT%
/tmp/
</copy>
<rollback>

6
src/res/os/linksys.xml.in
View File

@ -25,8 +25,7 @@
<root>
<run>
<copy>
echo '%FWBPROMPT%';
cat > /tmp/%FWSCRIPT%
/tmp/
</copy>
<compression>
@ -63,8 +62,7 @@ echo "Activating policy";
<test>
<copy>
echo '%FWBPROMPT%';
cat > /tmp/%FWSCRIPT%
/tmp/
</copy>
<rollback>

22
src/res/os/linux24.xml
View File

@ -23,10 +23,7 @@
<reg_user>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT% &#38;&#38;
chmod +x %FWDIR%/%FWSCRIPT%;
echo Done;
%FWDIR%
</copy>
<compression>
@ -43,11 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% &#38;&#38; ( which pkill > /dev/null &#38;&#38; sudo
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT% &#38;&#38;
chmod +x %FWDIR%/tmp/%FWSCRIPT%;
echo Done;
%FWDIR%/tmp
</copy>
<rollback>
@ -67,10 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<root>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT% &#38;&#38;
chmod +x %FWDIR%/%FWSCRIPT%;
echo Done;
%FWDIR%
</copy>
<compression>
@ -85,11 +75,7 @@ sh %FWDIR%/%FWSCRIPT% &#38;&#38; ( which pkill > /dev/null &#38;&#38; pkill shut
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT% &#38;&#38;
chmod +x %FWDIR%/tmp/%FWSCRIPT%;
echo Done;
%FWDIR%/tmp
</copy>
<rollback>

22
src/res/os/linux24.xml.in
View File

@ -23,10 +23,7 @@
<reg_user>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT% &#38;&#38;
chmod +x %FWDIR%/%FWSCRIPT%;
echo Done;
%FWDIR%
</copy>
<compression>
@ -43,11 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% &#38;&#38; ( which pkill > /dev/null &#38;&#38; sudo
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT% &#38;&#38;
chmod +x %FWDIR%/tmp/%FWSCRIPT%;
echo Done;
%FWDIR%/tmp
</copy>
<rollback>
@ -67,10 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<root>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT% &#38;&#38;
chmod +x %FWDIR%/%FWSCRIPT%;
echo Done;
%FWDIR%
</copy>
<compression>
@ -85,11 +75,7 @@ sh %FWDIR%/%FWSCRIPT% &#38;&#38; ( which pkill > /dev/null &#38;&#38; pkill shut
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT% &#38;&#38;
chmod +x %FWDIR%/tmp/%FWSCRIPT%;
echo Done;
%FWDIR%/tmp
</copy>
<rollback>

14
src/res/os/macosx.xml
View File

@ -23,8 +23,7 @@
<reg_user>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -41,9 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% &#38;&#38; (ps ax|awk '/shutdown/ &#38;&#38; !/awk/ {
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>
@ -63,8 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<root>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -79,9 +75,7 @@ sh %FWDIR%/%FWSCRIPT% &#38;&#38; (ps ax|awk '/shutdown/ &#38;&#38; \!/awk/ {prin
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>

14
src/res/os/macosx.xml.in
View File

@ -23,8 +23,7 @@
<reg_user>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -41,9 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% &#38;&#38; (ps ax|awk '/shutdown/ &#38;&#38; !/awk/ {
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>
@ -63,8 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<root>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -79,9 +75,7 @@ sh %FWDIR%/%FWSCRIPT% &#38;&#38; (ps ax|awk '/shutdown/ &#38;&#38; \!/awk/ {prin
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>

14
src/res/os/openbsd.xml
View File

@ -23,8 +23,7 @@
<reg_user>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -41,9 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% &#38;&#38; sudo -S pkill shutdown; echo 'Policy activ
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>
@ -63,8 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<root>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -79,9 +75,7 @@ sh %FWDIR%/%FWSCRIPT% &#38;&#38; pkill shutdown; echo 'Policy activated'
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>

14
src/res/os/openbsd.xml.in
View File

@ -23,8 +23,7 @@
<reg_user>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -41,9 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% &#38;&#38; sudo -S pkill shutdown; echo 'Policy activ
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>
@ -63,8 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<root>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -79,9 +75,7 @@ sh %FWDIR%/%FWSCRIPT% &#38;&#38; pkill shutdown; echo 'Policy activated'
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>

14
src/res/os/solaris.xml
View File

@ -23,8 +23,7 @@
<reg_user>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -41,9 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% &#38;&#38; sudo -S pkill shutdown; echo 'Policy activ
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>
@ -63,8 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<root>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -79,9 +75,7 @@ sh %FWDIR%/%FWSCRIPT% &#38;&#38; pkill shutdown; echo 'Policy activated'
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>

14
src/res/os/solaris.xml.in
View File

@ -23,8 +23,7 @@
<reg_user>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -41,9 +40,7 @@ sudo -S %FWDIR%/%FWSCRIPT% &#38;&#38; sudo -S pkill shutdown; echo 'Policy activ
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>
@ -63,8 +60,7 @@ sudo -S %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<root>
<run>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<compression>
@ -79,9 +75,7 @@ sh %FWDIR%/%FWSCRIPT% &#38;&#38; pkill shutdown; echo 'Policy activated'
<test>
<copy>
echo '%FWBPROMPT%';
mkdir -p %FWDIR%/tmp;
cat > %FWDIR%/tmp/%FWSCRIPT%;
%FWDIR%/tmp
</copy>
<rollback>

14
src/res/os/unknown_os.xml
View File

@ -20,8 +20,7 @@
<reg_user>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<run>
@ -38,6 +37,10 @@ sudo -S %FWDIR%/%FWSCRIPT% &#38;&#38; (sudo -S ps ax|awk '/shutdown/ &#38;&#38;
</run>
<test>
<copy>
%FWDIR%/tmp
</copy>
<rollback>
echo '%FWBPROMPT%';
chmod +x /tmp/%FWSCRIPT%;
@ -54,8 +57,7 @@ sudo -S /tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<root>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<run>
@ -70,6 +72,10 @@ sh %FWDIR%/%FWSCRIPT% &#38;&#38; (ps ax|awk '/shutdown/ &#38;&#38; \!/awk/ {prin
</run>
<test>
<copy>
%FWDIR%/tmp
</copy>
<rollback>
echo '%FWBPROMPT%';
/sbin/shutdown -r +%RBTIMEOUT%;

14
src/res/os/unknown_os.xml.in
View File

@ -20,8 +20,7 @@
<reg_user>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<run>
@ -38,6 +37,10 @@ sudo -S %FWDIR%/%FWSCRIPT% &#38;&#38; (sudo -S ps ax|awk '/shutdown/ &#38;&#38;
</run>
<test>
<copy>
%FWDIR%/tmp
</copy>
<rollback>
echo '%FWBPROMPT%';
chmod +x /tmp/%FWSCRIPT%;
@ -54,8 +57,7 @@ sudo -S /tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<root>
<copy>
echo '%FWBPROMPT%';
cat > %FWDIR%/%FWSCRIPT%;
%FWDIR%
</copy>
<run>
@ -70,6 +72,10 @@ sh %FWDIR%/%FWSCRIPT% &#38;&#38; (ps ax|awk '/shutdown/ &#38;&#38; \!/awk/ {prin
</run>
<test>
<copy>
%FWDIR%/tmp
</copy>
<rollback>
echo '%FWBPROMPT%';
/sbin/shutdown -r +%RBTIMEOUT%;