holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Avoid use of symbolic link /sbin/shorewall from init scripts

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4052 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-06-10 13:32:56 +00:00
parent 8884d5ba59
commit d465f2258f
7 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall-lite/init.archlinux.sh
View File

@ -20,7 +20,7 @@ DAEMON_NAME="shorewall" # of course shorewall is NOT a deamon.
case "$1" in case "$1" in
start) start)
stat_busy "Starting $DAEMON_NAME" stat_busy "Starting $DAEMON_NAME"
/sbin/shorewall $OPTIONS start &>/dev/null /usr/share/shorewall-lite/shorewall $OPTIONS start &>/dev/null
if [ $? -gt 0 ]; then if [ $? -gt 0 ]; then
stat_fail stat_fail
else else
@ -32,7 +32,7 @@ case "$1" in
stop) stop)
stat_busy "Stopping $DAEMON_NAME" stat_busy "Stopping $DAEMON_NAME"
/sbin/shorewall stop &>/dev/null /usr/share/shorewall-lite/shorewall stop &>/dev/null
if [ $? -gt 0 ]; then if [ $? -gt 0 ]; then
stat_fail stat_fail
else else
@ -43,7 +43,7 @@ case "$1" in
restart|reload) restart|reload)
stat_busy "Restarting $DAEMON_NAME" stat_busy "Restarting $DAEMON_NAME"
/sbin/shorewall restart &>/dev/null /usr/share/shorewall-lite/shorewall restart &>/dev/null
if [ $? -gt 0 ]; then if [ $? -gt 0 ]; then
stat_fail stat_fail
else else

2
Shorewall-lite/init.debian.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
SRWL=/sbin/shorewall SRWL=/usr/share/shorewall-lite/shorewall
WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup
# Note, set INITLOG to /dev/null if you do not want to # Note, set INITLOG to /dev/null if you do not want to
# keep logs of the firewall (not recommended) # keep logs of the firewall (not recommended)

6
Shorewall-lite/init.sh
View File

@ -74,14 +74,14 @@ command="$1"
case "$command" in case "$command" in
start) start)
exec /sbin/shorewall $OPTIONS $@ exec /usr/share/shorewall-lite/shorewall $OPTIONS $@
;; ;;
stop|restart|status) stop|restart|status)
exec /sbin/shorewall $@ exec /usr/share/shorewall-lite/shorewall $@
;; ;;
reload) reload)
shift shift
exec /sbin/shorewall restart $@ exec /usr/share/shorewall-lite/shorewall restart $@
;; ;;
*) *)
usage usage

6
Shorewall/init.archlinux.sh
View File

@ -20,7 +20,7 @@ DAEMON_NAME="shorewall" # of course shorewall is NOT a deamon.
case "$1" in case "$1" in
start) start)
stat_busy "Starting $DAEMON_NAME" stat_busy "Starting $DAEMON_NAME"
/sbin/shorewall $OPTIONS start &>/dev/null /usr/share/shorewall/shorewall $OPTIONS start &>/dev/null
if [ $? -gt 0 ]; then if [ $? -gt 0 ]; then
stat_fail stat_fail
else else
@ -32,7 +32,7 @@ case "$1" in
stop) stop)
stat_busy "Stopping $DAEMON_NAME" stat_busy "Stopping $DAEMON_NAME"
/sbin/shorewall stop &>/dev/null /usr/share/shorewall/shorewall stop &>/dev/null
if [ $? -gt 0 ]; then if [ $? -gt 0 ]; then
stat_fail stat_fail
else else
@ -43,7 +43,7 @@ case "$1" in
restart|reload) restart|reload)
stat_busy "Restarting $DAEMON_NAME" stat_busy "Restarting $DAEMON_NAME"
/sbin/shorewall restart &>/dev/null /usr/share/shorewall restart &>/dev/null
if [ $? -gt 0 ]; then if [ $? -gt 0 ]; then
stat_fail stat_fail
else else

2
Shorewall/init.debian.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
SRWL=/sbin/shorewall SRWL=/usr/share/shorewall/shorewall
WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup
# Note, set INITLOG to /dev/null if you do not want to # Note, set INITLOG to /dev/null if you do not want to
# keep logs of the firewall (not recommended) # keep logs of the firewall (not recommended)

6
Shorewall/init.sh
View File

@ -74,14 +74,14 @@ command="$1"
case "$command" in case "$command" in
start) start)
exec /sbin/shorewall $OPTIONS $@ exec /usr/share/shorewall/shorewall $OPTIONS $@
;; ;;
stop|restart|status) stop|restart|status)
exec /sbin/shorewall $@ exec /usr/share/shorewall/shorewall $@
;; ;;
reload) reload)
shift shift
exec /sbin/shorewall restart $@ exec /usr/share/shorewall/shorewall restart $@
;; ;;
*) *)
usage usage

9
docs/CompiledPrograms.xml
View File

@ -276,6 +276,9 @@
<para>Modify <filename>/etc/shorewall-lite/shorewall.conf</filename> <para>Modify <filename>/etc/shorewall-lite/shorewall.conf</filename>
as needed.</para> as needed.</para>
<para>If you are running Debian or one of its derivatives like Ubuntu
then edit /etc/default/shorewall-lite and set startup=1.</para>
<programlisting><command>shorewall start</command></programlisting> <programlisting><command>shorewall start</command></programlisting>
</listitem> </listitem>
</orderedlist> </orderedlist>
@ -395,6 +398,10 @@
<para>Modify <filename>/etc/shorewall-lite/shorewall.conf</filename> <para>Modify <filename>/etc/shorewall-lite/shorewall.conf</filename>
as needed.</para> as needed.</para>
<para>If you are running Debian or one of its derivatives like
Ubuntu then edit /etc/default/shorewall-lite and set
startup=1.</para>
<programlisting><command>shorewall start</command></programlisting> <programlisting><command>shorewall start</command></programlisting>
</listitem> </listitem>
</orderedlist> </orderedlist>
@ -495,4 +502,4 @@ MANGLE_FORWARD # Mangle table has FORWARD chain</programlisting
is the level specified in the shorewall.conf file used when then program is the level specified in the shorewall.conf file used when then program
was compiled.</para> was compiled.</para>
</section> </section>
</article> </article>