Hi Tom,

Attached are some simple patches for the service file definitions.
Notably, they remove the ExecReload from all services, since systemd
doesn't allow an ExecReload for OneShot services. Also, we add a
missing After=network.target to shorewall.service.

Cheers,
Jonathan.
diff -up shorewall6-4.4.23.3/shorewall6.service.orig shorewall6-4.4.23.3/shorewall6.service
--- shorewall6-4.4.23.3/shorewall6.service.orig	2011-10-10 22:51:02.871268507 +0100
+++ shorewall6-4.4.23.3/shorewall6.service	2011-10-10 22:51:21.918621930 +0100
@@ -14,7 +14,6 @@ RemainAfterExit=yes
 EnvironmentFile=-/etc/sysconfig/shorewall6
 StandardOutput=syslog
 ExecStart=/sbin/shorewall6 $OPTIONS start
-ExecReload=/sbin/shorewall6 $OPTIONS restart
 ExecStop=/sbin/shorewall6 $OPTIONS stop
 
 [Install]
diff -up shorewall6-lite-4.4.23.3/shorewall6-lite.service.orig shorewall6-lite-4.4.23.3/shorewall6-lite.service
--- shorewall6-lite-4.4.23.3/shorewall6-lite.service.orig	2011-10-10 23:06:43.923654871 +0100
+++ shorewall6-lite-4.4.23.3/shorewall6-lite.service	2011-10-10 23:06:56.736247939 +0100
@@ -14,7 +14,6 @@ RemainAfterExit=yes
 EnvironmentFile=-/etc/sysconfig/shorewall6-lite
 StandardOutput=syslog
 ExecStart=/sbin/shorewall6-lite $OPTIONS start
-ExecReload=/sbin/shorewall6-lite $OPTIONS restart
 ExecStop=/sbin/shorewall6-lite $OPTIONS stop
 
 [Install]
diff -up shorewall-4.4.23.3/shorewall.service.orig shorewall-4.4.23.3/shorewall.service
--- shorewall-4.4.23.3/shorewall.service.orig	2011-10-10 22:45:27.887663791 +0100
+++ shorewall-4.4.23.3/shorewall.service	2011-10-10 22:49:44.790920511 +0100
@@ -6,6 +6,7 @@
 [Unit]
 Description=Shorewall IPv4 firewall
 After=syslog.target
+After=network.target
 
 [Service]
 Type=oneshot
@@ -13,7 +14,6 @@ RemainAfterExit=yes
 EnvironmentFile=-/etc/sysconfig/shorewall
 StandardOutput=syslog
 ExecStart=/sbin/shorewall $OPTIONS start
-ExecReload=/sbin/shorewall $OPTIONS restart
 ExecStop=/sbin/shorewall $OPTIONS stop
 
 [Install]
diff -up shorewall-init-4.4.23.3/shorewall-init.service.orig shorewall-init-4.4.23.3/shorewall-init.service
--- shorewall-init-4.4.23.3/shorewall-init.service.orig	2011-10-10 23:07:21.242469577 +0100
+++ shorewall-init-4.4.23.3/shorewall-init.service	2011-10-10 23:07:35.019031981 +0100
@@ -14,7 +14,6 @@ RemainAfterExit=yes
 EnvironmentFile=-/etc/sysconfig/shorewall-init
 StandardOutput=syslog
 ExecStart=/sbin/shorewall-init $OPTIONS start
-ExecReload=/sbin/shorewall-init $OPTIONS restart
 ExecStop=/sbin/shorewall-init $OPTIONS stop
 
 [Install]
diff -up shorewall-lite-4.4.23.3/shorewall-lite.service.orig shorewall-lite-4.4.23.3/shorewall-lite.service
--- shorewall-lite-4.4.23.3/shorewall-lite.service.orig	2011-10-10 22:50:26.385507446 +0100
+++ shorewall-lite-4.4.23.3/shorewall-lite.service	2011-10-10 22:50:42.615956249 +0100
@@ -14,7 +14,6 @@ RemainAfterExit=yes
 EnvironmentFile=-/etc/sysconfig/shorewall-lite
 StandardOutput=syslog
 ExecStart=/sbin/shorewall-lite $OPTIONS start
-ExecReload=/sbin/shorewall-lite $OPTIONS restart
 ExecStop=/sbin/shorewall-lite $OPTIONS stop
 
 [Install]
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel

Reply via email to