--- pve-cluster/data/PVE/Cluster.pm.alt	2017-12-07 17:26:00.008683200 +0300
+++ pve-cluster/data/PVE/Cluster.pm	2017-12-12 11:33:13.768670185 +0300
@@ -49,11 +49,11 @@ my $pvewww_key_fn = "$basedir/pve-www.ke
 # 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 = "/etc/pve/priv/known_hosts";
 my $sshauthkeys = "/etc/pve/priv/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";
@@ -189,10 +189,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 $@;
@@ -271,7 +271,7 @@ string_mask = nombstr
 
 [ req_distinguished_name ]
 organizationalUnitName = PVE Cluster Node
-organizationName = Proxmox Virtual Environment
+organizationName = BaseALT Virtual Environment
 commonName = $fqdn
 
 [ v3_req ]
@@ -304,7 +304,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', '3650', '-out', $pvessl_cert_fn,
 			'-CAkey', $pveca_key_fn, '-CA', $pveca_cert_fn,
 			'-CAserial', $pveca_srl_fn, '-extfile', $cfgfn]);
--- pve-cluster/data/PVE/Makefile.am.alt	2017-12-07 17:26:00.008683200 +0300
+++ pve-cluster/data/PVE/Makefile.am	2017-12-12 11:33:13.768670185 +0300
@@ -4,7 +4,7 @@ IPCC.c: IPCC.xs
 	xsubpp IPCC.xs > IPCC.xsc
 	mv IPCC.xsc IPCC.c
 
-AM_CFLAGS = -shared -fPIC -Wl,-z,relro -Wall -Werror -Wno-strict-aliasing $(PERL_INC) -DXS_VERSION=VERSION
+AM_CFLAGS = -shared -fPIC -Wl,-z,relro -Wall -Wno-strict-aliasing $(PERL_INC) -DXS_VERSION=VERSION
 LDADD = $(QB_LIBS)
 
 perlbin_PROGRAMS = IPCC.so
@@ -17,7 +17,7 @@ include /usr/share/pve-doc-generator/pve
 export PERLLIB=..
 
 %.bash-completion:
-	LD_LIBRARY_PATH=. perl -I.. -T -e "use PVE::CLI::$*; PVE::CLI::$*->generate_bash_completions();" >$@.tmp
+	LD_LIBRARY_PATH=. perl -I../../pve-access-control -I../../pve-apiclient -I.. -T -e "use PVE::CLI::$*; PVE::CLI::$*->generate_bash_completions();" >$@.tmp
 	mv $@.tmp $@
 
 man1_MANS = pvecm.1
@@ -37,8 +37,8 @@ apiclass_DATA = API2/ClusterConfig.pm
 apiclassdir = $(PERL_VENDORLIB)/PVE/API2
 
 install-exec-hook: pvecm.bash-completion
-	LD_LIBRARY_PATH=. perl -I.. -T -e "use PVE::CLI::pvecm; PVE::CLI::pvecm->verify_api();"
-	install -m 0644 -D pvecm.bash-completion ${DESTDIR}/usr/share/bash-completion/completions/pvecm
+	LD_LIBRARY_PATH=. perl -I../../pve-access-control -I../../pve-apiclient -I.. -T -e "use PVE::CLI::pvecm; PVE::CLI::pvecm->verify_api();"
+	install -m 0644 -D pvecm.bash-completion ${DESTDIR}/etc/bash_completion.d/pvecm
 
 clean-local:
 	make cleanup-docgen
--- pve-cluster/data/src/Makefile.am.alt	2017-12-07 17:26:00.008683200 +0300
+++ pve-cluster/data/src/Makefile.am	2017-12-12 11:33:13.768670185 +0300
@@ -48,7 +48,7 @@ libpmxcfs_a_SOURCES = 		\
 	memdb.c
 
 # add -lprofiler for google perftools
-AM_CFLAGS =  -g -O -Wl,-z,relro -std=gnu99 -Wall -Werror -Wno-strict-aliasing $(COROSYNC_CFLAGS) $(SQLITE3_CFLAGS) $(FUSE_CFLAGS) $(QB_CFLAGS) $(GLIB_CFLAGS) $(LIBRRD_CFLAGS) 
+AM_CFLAGS =  -g -O -Wl,-z,relro -std=gnu99 -Wall -Wno-strict-aliasing $(COROSYNC_CFLAGS) $(SQLITE3_CFLAGS) $(FUSE_CFLAGS) $(QB_CFLAGS) $(GLIB_CFLAGS) $(LIBRRD_CFLAGS) 
 LDADD = libpmxcfs.a $(COROSYNC_LIBS) $(SQLITE3_LIBS) $(FUSE_LIBS) $(QB_LIBS) $(GLIB_LIBS) $(LIBRRD_LIBS) 
 
 clean-local:
--- pve-cluster/data/test/Makefile.alt	2017-12-07 17:26:00.008683200 +0300
+++ pve-cluster/data/test/Makefile	2017-12-12 11:33:13.769670187 +0300
@@ -2,7 +2,7 @@ all:
 
 .PHONY: check install clean distclean
 check:
-	./corosync_parser_test.pl
+	perl -I../PVE ./corosync_parser_test.pl
 
 install: check
 distclean: clean
--- pve-cluster/debian/pve-cluster.service.alt	2017-12-12 11:33:13.769670187 +0300
+++ pve-cluster/debian/pve-cluster.service	2017-12-12 11:38:02.939231996 +0300
@@ -1,21 +1,22 @@
 [Unit]
-Description=The Proxmox VE cluster filesystem
+Description=PVE cluster filesystem
 ConditionFileIsExecutable=/usr/bin/pmxcfs
 Wants=corosync.service
-Wants=systemd-timesyncd.service
+Wants=cronyd.service
 Wants=rrdcached.service
 Before=corosync.service
 Before=ceph.service
-Before=cron.service
+Before=crond.service
 After=network.target
 After=sys-fs-fuse-connections.mount
-After=systemd-timesyncd.service
+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
 ExecStartPost=-/usr/bin/pvecm updatecerts --silent
 KillMode=mixed