--- pve-firewall/debian/pve-firewall.logrotate.alt	2021-09-10 11:00:11.000000000 +0000

+++ pve-firewall/debian/pve-firewall.logrotate	2021-09-27 08:38:30.830568175 +0000

@@ -8,6 +8,6 @@

     sharedscripts

     create 640 root adm

     postrotate

-	invoke-rc.d pvefw-logger restart 2>/dev/null >/dev/null || true

+	/sbin/systemctl restart pvefw-logger >/dev/null 2>&1 || true

     endscript

 }

--- pve-firewall/debian/pve-firewall.service.alt	2021-09-10 11:00:11.000000000 +0000

+++ pve-firewall/debian/pve-firewall.service	2021-09-27 08:38:30.831568179 +0000

@@ -1,5 +1,5 @@

 [Unit]

-Description=Proxmox VE firewall

+Description=PVE firewall

 ConditionPathExists=/usr/sbin/pve-firewall

 Wants=pve-cluster.service pvefw-logger.service

 After=pvefw-logger.service pve-cluster.service network.target systemd-modules-load.service

@@ -8,9 +8,6 @@ Before=shutdown.target

 Conflicts=shutdown.target

 [Service]

-ExecStartPre=-/usr/bin/update-alternatives --set ebtables /usr/sbin/ebtables-legacy

-ExecStartPre=-/usr/bin/update-alternatives --set iptables /usr/sbin/iptables-legacy

-ExecStartPre=-/usr/bin/update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy

 ExecStart=/usr/sbin/pve-firewall start

 ExecStop=/usr/sbin/pve-firewall stop

 ExecReload=/usr/sbin/pve-firewall restart

--- pve-firewall/debian/pvefw-logger.service.alt	2021-09-10 11:00:11.000000000 +0000

+++ pve-firewall/debian/pvefw-logger.service	2021-09-27 08:38:30.831568179 +0000

@@ -1,9 +1,10 @@

 [Unit]

-Description=Proxmox VE firewall logger

+Description=PVE firewall logger

 ConditionPathExists=/usr/sbin/pvefw-logger

 DefaultDependencies=no

 Before=shutdown.target

-After=local-fs.target 

+Wants=pve-cluster.service

+After=local-fs.target pve-cluster.service

 Conflicts=shutdown.target

 [Service]

--- pve-firewall/src/Makefile.alt	2021-09-10 11:00:11.000000000 +0000

+++ pve-firewall/src/Makefile	2021-09-27 08:40:41.091023386 +0000

@@ -15,11 +15,11 @@ include /usr/share/pve-doc-generator/pve

 all: pve-firewall.8 pvefw-logger

 pve-firewall.bash-completion: PVE/Service/pve_firewall.pm

-	perl -I. -T -e "use PVE::Service::pve_firewall; PVE::Service::pve_firewall->generate_bash_completions();" >$@.tmp

+	perl -I../../pve-container/src -I../../qemu-server -I. -T -e "use PVE::Service::pve_firewall; PVE::Service::pve_firewall->generate_bash_completions();" >$@.tmp

 	mv $@.tmp $@

 pve-firewall.zsh-completion: PVE/Service/pve_firewall.pm

-	perl -I. -T -e "use PVE::Service::pve_firewall; PVE::Service::pve_firewall->generate_zsh_completions();" >$@.tmp

+	perl -I../../pve-container/src -I../../qemu-server -I. -T -e "use PVE::Service::pve_firewall; PVE::Service::pve_firewall->generate_zsh_completions();" >$@.tmp

 	mv $@.tmp $@

 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)

@@ -27,7 +27,7 @@ CFLAGS+=$(shell pkg-config libnetfilter_

 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)

 pvefw-logger: pvefw-logger.c

-	gcc -Wall -Werror pvefw-logger.c -o pvefw-logger -std=gnu99 $(CFLAGS) $(LDFLAGS)

+	gcc -Wall pvefw-logger.c -o pvefw-logger -std=gnu99 $(CFLAGS) $(LDFLAGS)

 .PHONY: install

 install: pve-firewall pve-firewall.8 pve-firewall.bash-completion pve-firewall.zsh-completion pvefw-logger

@@ -39,8 +39,8 @@ install: pve-firewall pve-firewall.8 pve

 	install -m 0644 pve-firewall.8 ${MAN8DIR}

 	install -m 0644 -D pve-firewall.bash-completion ${BASHCOMPLDIR}/pve-firewall

 	install -m 0644 -D pve-firewall.zsh-completion ${ZSHCOMPLDIR}/_pve-firewall

-	install -d -m 0755 ${DESTDIR}/usr/lib/sysctl.d/

-	install -m 0644 pve-firewall-sysctl.conf ${DESTDIR}/usr/lib/sysctl.d/pve-firewall.conf

+	install -d -m 0755 ${DESTDIR}/etc/sysctl.d/

+	install -m 0644 pve-firewall-sysctl.conf ${DESTDIR}/etc/sysctl.d/pve-firewall.conf

 .PHONY: clean

 clean: 	

--- pve-firewall/src/PVE/Service/pve_firewall.pm.alt	2021-09-10 11:00:11.000000000 +0000

+++ pve-firewall/src/PVE/Service/pve_firewall.pm	2021-09-27 08:38:30.831568179 +0000

@@ -114,9 +114,9 @@ sub run {

     }

 }

-$daemon->register_start_command("Start the Proxmox VE firewall service.");

-$daemon->register_restart_command(1, "Restart the Proxmox VE firewall service.");

-$daemon->register_stop_command("Stop firewall. This removes all Proxmox VE " .

+$daemon->register_start_command("Start the PVE firewall service.");

+$daemon->register_restart_command(1, "Restart the PVE firewall service.");

+$daemon->register_stop_command("Stop firewall. This removes all PVE " .

 			       "related iptable rules. " .

 			       "The host is unprotected afterwards.");