--- pve-cluster/data/PVE/Cluster/Setup.pm.alt	2021-07-01 10:42:57.000000000 +0000
+++ pve-cluster/data/PVE/Cluster/Setup.pm	2021-07-27 14:50:58.979269415 +0000
@@ -80,11 +80,11 @@ my $pvewww_key_fn = "$pmxcfs_base_dir/pv
 # ssh related files
 my $ssh_rsa_id_priv = "/root/.ssh/id_rsa";
 my $ssh_rsa_id = "/root/.ssh/id_rsa.pub";
-my $ssh_host_rsa_id = "/etc/ssh/ssh_host_rsa_key.pub";
-my $sshglobalknownhosts = "/etc/ssh/ssh_known_hosts";
+my $ssh_host_rsa_id = "/etc/openssh/ssh_host_rsa_key.pub";
+my $sshglobalknownhosts = "/etc/openssh/ssh_known_hosts";
 my $sshknownhosts = "$pmxcfs_auth_dir/known_hosts";
 my $sshauthkeys = "$pmxcfs_auth_dir/authorized_keys";
-my $sshd_config_fn = "/etc/ssh/sshd_config";
+my $sshd_config_fn = "/etc/openssh/sshd_config";
 my $rootsshauthkeys = "/root/.ssh/authorized_keys";
 my $rootsshauthkeysbackup = "${rootsshauthkeys}.org";
 my $rootsshconfig = "/root/.ssh/config";
@@ -401,10 +401,10 @@ sub gen_pveca_cert {
 
     eval {
 	# wrap openssl with faketime to prevent bug #904
-	run_silent_cmd(['faketime', 'yesterday', 'openssl', 'req', '-batch',
+	run_silent_cmd(['faketime', '-d', 'yesterday', 'openssl', 'req', '-batch',
 			'-days', '3650', '-new', '-x509', '-nodes', '-key',
 			$pveca_key_fn, '-out', $pveca_cert_fn, '-subj',
-			"/CN=Proxmox Virtual Environment/OU=$uuid_str/O=PVE Cluster Manager CA/"]);
+			"/CN=BaseALT Virtual Environment/OU=$uuid_str/O=PVE Cluster Manager CA/"]);
     };
 
     die "generating pve root certificate failed:\n$@" if $@;
@@ -483,7 +483,7 @@ string_mask = nombstr
 
 [ req_distinguished_name ]
 organizationalUnitName = PVE Cluster Node
-organizationName = Proxmox Virtual Environment
+organizationName = BaseALT Virtual Environment
 commonName = $fqdn
 
 [ v3_req ]
@@ -533,7 +533,7 @@ __EOD
 
     eval {
 	# wrap openssl with faketime to prevent bug #904
-	run_silent_cmd(['faketime', 'yesterday', 'openssl', 'x509', '-req',
+	run_silent_cmd(['faketime', '-d', 'yesterday', 'openssl', 'x509', '-req',
 			'-in', $reqfn, '-days', $daysleft, '-out', $pvessl_cert_fn,
 			'-CAkey', $pveca_key_fn, '-CA', $pveca_cert_fn,
 			'-CAserial', $pveca_srl_fn, '-extfile', $cfgfn]);
--- pve-cluster/data/PVE/Makefile.alt	2021-07-01 10:42:57.000000000 +0000
+++ pve-cluster/data/PVE/Makefile	2021-07-27 14:50:58.979269415 +0000
@@ -2,10 +2,10 @@ DESTDIR=
 PERL5DIR=${DESTDIR}/usr/share/perl5
 PVEDIR=${PERL5DIR}/PVE
 MAN=${DESTDIR}/usr/share/man
-BASHCOMPLETION=${DESTDIR}/usr/share/bash-completion/completions
+BASHCOMPLETION=${DESTDIR}/etc/bash_completion.d
 ZSHCOMPLETION=${DESTDIR}/usr/share/zsh/vendor-completions
 
-PERL_VENDORARCH=$(shell perl -MConfig -e 'print $$Config{vendorarch};')
+PERL_VENDORARCH=$(shell perl -MConfig -e 'print $$Config{archlibexp};')
 PVE_VENDORARCH=${DESTDIR}/${PERL_VENDORARCH}/auto/PVE/IPCC
 
 PERL_DOC_INC_DIRS:=..
@@ -28,34 +28,34 @@ install: pvecm ${SOURCES} IPCC.so pvecm.
 	for d in ${SUBDIRS}; do $(MAKE) -C $$d install; done
 
 %.bash-completion:
-	perl ${PERL_DOC_INC} -T -e "use PVE::CLI::$*; PVE::CLI::$*->generate_bash_completions();" >$@.tmp
+	perl ${PERL_DOC_INC} -I../../pve-access-control/src -I../../pve-apiclient -I.. -T -e "use PVE::CLI::$*; PVE::CLI::$*->generate_bash_completions();" >$@.tmp
 	mv $@.tmp $@
 
 %.zsh-completion:
-	perl ${PERL_DOC_INC} -T -e "use PVE::CLI::$*; PVE::CLI::$*->generate_zsh_completions();" >$@.tmp
+	perl ${PERL_DOC_INC} -I../../pve-access-control/src -I../../pve-apiclient -I.. -T -e "use PVE::CLI::$*; PVE::CLI::$*->generate_zsh_completions();" >$@.tmp
 	mv $@.tmp $@
 
 Cluster/IPCConst.pm:
 	$(MAKE) -C Cluster IPCConst.pm
 
 check: IPCC.so Cluster/IPCConst.pm
-	perl ${PERL_DOC_INC} -T -e "use PVE::CLI::pvecm; PVE::CLI::pvecm->verify_api();"
+	perl ${PERL_DOC_INC} -I../../pve-access-control/src -I../../pve-apiclient -I.. -T -e "use PVE::CLI::pvecm; PVE::CLI::pvecm->verify_api();"
 
 CC=gcc
-CFLAGS += -fPIC -Wl,-z,relro -Wall -Werror -Wno-strict-aliasing -g -O2 -shared
+CFLAGS += -fPIC -Wl,-z,relro -Wall -Wno-strict-aliasing -g -O2 -shared
 CFLAGS += $(shell pkg-config --cflags libqb)
-CFLAGS += $(shell perl -MExtUtils::Embed -e perl_inc)
+CFLAGS += $(shell perl -MConfig -e 'print $$Config{ccflags};')
 LDFLAGS = $(shell pkg-config --libs libqb)
 
 .c.o:
-	$(CC) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -I${PERL_VENDORARCH}/CORE -c -o $@ $<
 
 IPCC.c: IPCC.xs ppport.h
 	xsubpp -noversioncheck IPCC.xs > IPCC.xsc
 	mv IPCC.xsc IPCC.c
 
 IPCC.so: IPCC.o
-	$(CC) ${CFLAGS} -shared -o $@ $<  ${LDFLAGS}
+	$(CC) ${CFLAGS} -o $@ $< ${LDFLAGS} -L${PERL_VENDORARCH}/CORE -lperl
 
 -include /usr/share/pve-doc-generator/pve-doc-generator.mk
 
--- pve-cluster/data/src/Makefile.alt	2021-07-01 10:42:57.000000000 +0000
+++ pve-cluster/data/src/Makefile	2021-07-27 14:50:58.980269419 +0000
@@ -3,7 +3,7 @@ DEPENDENCIES=libcpg libcmap libquorum li
 
 CC = gcc
 CFLAGS += -std=gnu99
-CFLAGS += -Wall -Werror -Wno-unknown-pragmas -Wno-strict-aliasing
+CFLAGS += -Wall -Wno-unknown-pragmas -Wno-strict-aliasing
 CFLAGS += -Wpedantic
 CFLAGS += -g -O2 -Wl,-z,relro
 CFLAGS += -I.
--- pve-cluster/data/test/Makefile.alt	2021-07-01 10:42:57.000000000 +0000
+++ pve-cluster/data/test/Makefile	2021-07-27 14:50:58.980269419 +0000
@@ -2,7 +2,7 @@ all:
 
 .PHONY: check install clean distclean
 check:
-	./corosync_parser_test.pl
+	perl -I../PVE ./corosync_parser_test.pl
 
 distclean: clean
 clean:
--- pve-cluster/debian/pve-cluster.service.alt	2021-07-01 10:42:57.000000000 +0000
+++ pve-cluster/debian/pve-cluster.service	2021-07-27 14:50:58.980269419 +0000
@@ -1,19 +1,22 @@
 [Unit]
-Description=The Proxmox VE cluster filesystem
+Description=PVE cluster filesystem
 ConditionFileIsExecutable=/usr/bin/pmxcfs
+ConditionPathExistsGlob=/sys/devices/virtual/net/vmbr*/dev_id
+Wants=network-online.target
 Wants=corosync.service
 Wants=rrdcached.service
 Before=corosync.service
 Before=cron.service
-After=network.target
+After=network-online.target
 After=sys-fs-fuse-connections.mount
-After=time-sync.target
+After=chronyd.service
 After=rrdcached.service
 DefaultDependencies=no
 Before=shutdown.target
 Conflicts=shutdown.target
 
 [Service]
+ExecStartPre=-/bin/rm -f /etc/network/interfaces /etc/network/interfaces.new
 ExecStart=/usr/bin/pmxcfs
 KillMode=mixed
 Restart=on-failure