systemd: Remove double firewall scripts

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index a36a4ab98fd09128814a64cd18c32491968093b1..81cf50d133d09bb76b8ec1172ee730836a5dfa84 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -363,8 +363,7 @@ UNINSTALL_EXEC_HOOKS += ppp-uninstall-hook
 
 if HAVE_SYSTEMD
 systemdsystemunit_DATA = \
-       src/systemd/firewall4.service \
-       src/systemd/firewall6.service \
+       src/systemd/firewall.service \
        src/systemd/firewall-init.service \
        src/systemd/network-init.service \
        src/systemd/network@.service

diff --git a/src/systemd/firewall4.service.in b/src/systemd/firewall.service
similarity index 62%
rename from src/systemd/firewall4.service.in
rename to src/systemd/firewall.service
index 568f5e785af9fcf584c89d76fab5c29238250e9c..34797e54235b0339e5dd9013977d23c27cf8b525 100644 (file)
--- a/src/systemd/firewall4.service.in
+++ b/src/systemd/firewall.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Firewall for IPv4
+Description=Firewall for IPFire
 After=firewall-init.service
 Before=network.target
 Requires=firewall-init.service
@@ -7,8 +7,8 @@ Requires=firewall-init.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=@sbindir@/firewall4 start
-ExecStop=@sbindir@/firewall4 stop
+ExecStart=@sbindir@/firewall start
+ExecStop=@sbindir@/firewall stop
 
 [Install]
 WantedBy=multi-user.target

diff --git a/src/systemd/firewall6.service.in b/src/systemd/firewall6.service.in
deleted file mode 100644 (file)
index 873bfe6..0000000
--- a/src/systemd/firewall6.service.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Firewall for IPv6
-After=firewall-init.service
-Before=network.target
-Requires=firewall-init.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@sbindir@/firewall6 start
-ExecStop=@sbindir@/firewall6 stop
-
-[Install]
-WantedBy=multi-user.target