Update of /cvsroot/leaf/devel/pstraina/shorewall
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9825

Modified Files:
        shorewall-lrp.diff 
Log Message:
Spotted by Eric: pass flags in /etc/default/shorewall down on both start *and* 
restart.

Index: shorewall-lrp.diff
===================================================================
RCS file: /cvsroot/leaf/devel/pstraina/shorewall/shorewall-lrp.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shorewall-lrp.diff  11 Apr 2005 22:00:00 -0000      1.1
--- shorewall-lrp.diff  12 Apr 2005 23:34:50 -0000      1.2
***************
*** 1,5 ****
  --- init.sh   2005-02-02 13:07:23.000000000 -0800
! +++ init.sh   2005-04-11 14:16:57.805181789 -0700
! @@ -56,6 +56,14 @@
   }
   
--- 1,5 ----
  --- init.sh   2005-02-02 13:07:23.000000000 -0800
! +++ init.sh   2005-04-12 16:15:35.787984278 -0700
! @@ -56,18 +56,26 @@
   }
   
***************
*** 16,30 ****
   
################################################################################
   command="$1"
- @@ -64,7 +72,7 @@
   
!      start)
        
  -     exec /sbin/shorewall -f start
! +     exec /sbin/shorewall $OPTIONS start
        ;;
   
!      stop|restart|status)
  --- shorewall.conf    2005-04-07 09:39:14.000000000 -0700
! +++ shorewall.conf    2005-04-11 13:39:37.830703475 -0700
  @@ -67,7 +67,7 @@
   #
--- 16,36 ----
   
################################################################################
   command="$1"
   
!  case "$command" in
!  
! -    start)
! +    start|restart)
        
  -     exec /sbin/shorewall -f start
! +     exec /sbin/shorewall $OPTIONS $@
        ;;
   
! -    stop|restart|status)
! +    stop|status)
!  
!       exec /sbin/shorewall $@
!       ;;
  --- shorewall.conf    2005-04-07 09:39:14.000000000 -0700
! +++ shorewall.conf    2005-04-11 15:24:35.000000000 -0700
  @@ -67,7 +67,7 @@
   #
***************
*** 120,124 ****
   # BRIDGING
  --- start     2005-02-02 13:07:23.000000000 -0800
! +++ start     2005-04-11 13:39:37.830703475 -0700
  @@ -4,3 +4,7 @@
   # Add commands below that you want to be executed after shorewall has
--- 126,130 ----
   # BRIDGING
  --- start     2005-02-02 13:07:23.000000000 -0800
! +++ start     2005-04-11 15:24:35.000000000 -0700
  @@ -4,3 +4,7 @@
   # Add commands below that you want to be executed after shorewall has
***************
*** 129,135 ****
  +done
  +    
- diff -u -r shorewall-2.2.3/stop shorewall-2.2.3.pst/stop
  --- stop      2005-02-02 13:07:23.000000000 -0800
! +++ stop      2005-04-11 13:39:37.830703475 -0700
  @@ -4,3 +4,7 @@
   # Add commands below that you want to be executed at the beginning of a
--- 135,140 ----
  +done
  +    
  --- stop      2005-02-02 13:07:23.000000000 -0800
! +++ stop      2005-04-11 15:24:35.000000000 -0700
  @@ -4,3 +4,7 @@
   # Add commands below that you want to be executed at the beginning of a



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits

Reply via email to