extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-24 21:50:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup of Lite

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4078 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-06-12 16:48:07 +00:00
parent 97b01ffdc2
commit ac636aabb2
6 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Shorewall-lite/install.sh
View File

@ -273,6 +273,7 @@ echo "shorewall control program installed in /usr/share/shorewall-lite/shorewall
if [ -z "$PREFIX" ]; then
if [ ! -L /sbin/shorewall ]; then
[ -f /sbin/shorewall ] && backup_file /sbin/shorewall ${PREFIX}/var/lib/shorewall-lite-${VERSION}.bkout
ln -sf /usr/share/shorewall-lite/shorewall /sbin/shorewall
fi
fi

12
Shorewall-lite/shorewall
View File

@ -1205,12 +1205,12 @@ export CONFIG_PATH
get_config
if [ ! -f $FIREWALL ]; then
echo "ERROR: Shorewall is not properly installed"
echo " ERROR: Shorewall Lite is not properly installed" >&2
if [ -L $FIREWALL ]; then
echo " $FIREWALL is a symbolic link to a"
echo " non-existant file"
echo " $FIREWALL is a symbolic link to a" >&2
echo " non-existant file" >&2
else
echo " The file $FIREWALL does not exist"
echo " The file $FIREWALL does not exist" >&2
fi
exit 2
@ -1219,8 +1219,8 @@ fi
if [ -f $VERSION_FILE ]; then
version=$(cat $VERSION_FILE)
else
echo "ERROR: Shorewall is not properly installed"
echo " The file $VERSION_FILE does not exist"
echo " ERROR: Shorewall Lite is not properly installed" >&2
echo " The file $VERSION_FILE does not exist" >&2
exit 1
fi

1
Shorewall/install.sh
View File

@ -280,6 +280,7 @@ echo "shorewall control program installed in /usr/share/shorewall/shorewall"
if [ -z "$PREFIX" ]; then
if [ ! -L /sbin/shorewall ]; then
[ -f /sbin/shorewall ] && backup_file /sbin/shorewall ${PREFIX}/var/lib/shorewall-lite-${VERSION}.bkout
ln -sf /usr/share/shorewall/shorewall /sbin/shorewall
fi
fi

12
Shorewall/shorewall
View File

@ -1550,12 +1550,12 @@ export CONFIG_PATH
get_config
if [ ! -f $FIREWALL ]; then
echo "ERROR: Shorewall is not properly installed"
echo " ERROR: Shorewall is not properly installed" >&2
if [ -L $FIREWALL ]; then
echo " $FIREWALL is a symbolic link to a"
echo " non-existant file"
echo " $FIREWALL is a symbolic link to a" >&2
echo " non-existant file" >&2
else
echo " The file $FIREWALL does not exist"
echo " The file $FIREWALL does not exist" >&2
fi
exit 2
@ -1564,8 +1564,8 @@ fi
if [ -f $VERSION_FILE ]; then
version=$(cat $VERSION_FILE)
else
echo "ERROR: Shorewall is not properly installed"
echo " The file $VERSION_FILE does not exist"
echo " ERROR: Shorewall is not properly installed" >&2
echo " The file $VERSION_FILE does not exist" >&2
exit 1
fi

6
docs/CompiledPrograms.xml
View File

@ -473,13 +473,13 @@ MANGLE_FORWARD # Mangle table has FORWARD chain</programlisting
<para>To aid in creating this file, Shorewall Lite includes a
<command>shorecap</command> program. The program is installed in the
<filename>/usr/share/shorewall/</filename> directory and may be run as
follows:</para>
<filename>/usr/share/shorewall-lite/</filename> directory and may be run
as follows:</para>
<blockquote>
<para><command>[ IPTABLES=&lt;iptables binary&gt; ] [
MODULESDIR=&lt;kernel modules directory&gt; ]
/usr/share/shorewall/shorecap &gt; capabilities</command></para>
/usr/share/shorewall-lite/shorecap &gt; capabilities</command></para>
</blockquote>
<para>The IPTABLES and MODULESDIR options have their <ulink

9
docs/FAQ.xml
View File

@ -1842,6 +1842,15 @@ eth0 eth1 # eth1 = interface to local netwo
<title>(FAQ 55) I just installed Shorewall but /sbin/shorewall runs
Shorewall Lite!</title>
<para>Example:</para>
<blockquote>
<programlisting>wireless:/usr/share/shorewall-lite # <command>shorewall version</command>
ERROR: Shorewall Lite is not properly installed
The file /usr/share/shorewall-lite/firewall does not exist
wireless:/usr/share/shorewall-lite #</programlisting>
</blockquote>
<para><emphasis role="bold">Answer</emphasis>: This means that Shorewall
Lite was already installed when you installed Shorewall and the
/sbin/shorewall symbolic link is still pointing to the Shorewall Lite