On 11/11/2014 8:17 AM, Thomas D. wrote: > Hi, > > from "releasenotes.txt" in "shorewall6-4.6.5-RC1.tar.bz2": > >> 2) The installers now offer a choice of .service files, selected by >> the SERVICEFILE option. The default remains $PRODUCT.service. Each >> product supplying a .service file now supplies a .service.214. The >> differences between the standard .service files and the service.214 >> files are: >> >> a) They specify 'after=network-online.target' rather than >> 'after=network.target'. >> >> b) The file shorewall-init.service.214 specifies >> 'before=network-pre.target' rather than >> 'before=network.target'. That file requires serviced 214 or >> later, hence the names of the new files. >> >> Regardless of which file is selected, it is installed in >> $SERVICEDIR/$PRODUCT.service. > > But "shorewall6.service" and "shorewall6.service.214" are 100% identical.
Good catch! Patch attached (note that Shorewall-lite was correct). -Tom -- Tom Eastep \ When I die, I want to go like my Grandfather who Shoreline, \ died peacefully in his sleep. Not screaming like Washington, USA \ all of the passengers in his car http://shorewall.net \________________________________________________
diff --git a/Shorewall/shorewall.service b/Shorewall/shorewall.service index 4122371..c61e1ab 100644 --- a/Shorewall/shorewall.service +++ b/Shorewall/shorewall.service @@ -5,7 +5,7 @@ # [Unit] Description=Shorewall IPv4 firewall -After=network-online.target +After=network.target Conflicts=iptables.service firewalld.service [Service] diff --git a/Shorewall6-lite/shorewall6-lite.service b/Shorewall6-lite/shorewall6-lite.service index 3f2f9dd..19cc137 100644 --- a/Shorewall6-lite/shorewall6-lite.service +++ b/Shorewall6-lite/shorewall6-lite.service @@ -5,7 +5,7 @@ # [Unit] Description=Shorewall IPv6 firewall (lite) -After=network-online.target +After=network.target Conflicts=ip6tables.service firewalld.service [Service] @@ -13,7 +13,7 @@ Type=oneshot RemainAfterExit=yes EnvironmentFile=-/etc/sysconfig/shorewall6-lite StandardOutput=syslog -ExecStart=/sbin/shorewall6-lite $OPTIONS start +ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS ExecStop=/sbin/shorewall6-lite $OPTIONS stop [Install] diff --git a/Shorewall6/shorewall6.service b/Shorewall6/shorewall6.service index 0d79c28..1f17db8 100644 --- a/Shorewall6/shorewall6.service +++ b/Shorewall6/shorewall6.service @@ -5,7 +5,7 @@ # [Unit] Description=Shorewall IPv6 firewall -After=network-online.target +After=network.target Conflicts=ip6tables.service firewalld.service [Service]
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Comprehensive Server Monitoring with Site24x7. Monitor 10 servers for $9/Month. Get alerted through email, SMS, voice calls or mobile push notifications. Take corrective actions from your mobile device. http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
_______________________________________________ Shorewall-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-devel
