From: Michael Tremer Date: Sat, 22 Jun 2019 13:43:04 +0000 (+0000) Subject: systemd: Remove double firewall scripts X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67131768c979c66ad3717e46cb81a068b14eafee;p=network.git systemd: Remove double firewall scripts Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index a36a4ab9..81cf50d1 100644 --- 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 568f5e78..34797e54 100644 --- 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 index 873bfe69..00000000 --- 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