diff --git a/Makefile b/Makefile index caedbe69..96d02470 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ upload: ${DEB} check # rsync po/*.po po/pve-manager.pot pve.proxmox.com:/home/ftp/sources/po-files/ .PHONY: install -install: country.dat vznet.conf vzdump.conf vzdump-hook-script.pl pve-apt.conf mtu bridgevlan bridgevlanport vlan vlan-down +install: country.dat vzdump.conf vzdump-hook-script.pl pve-apt.conf mtu bridgevlan bridgevlanport vlan vlan-down install -d -m 0700 -o www-data -g www-data ${DESTDIR}/var/log/pveproxy install -D -m 0644 debian/pve.logrotate ${DESTDIR}/etc/logrotate.d/pve install -d ${DESTDIR}/usr/share/${PACKAGE} @@ -74,7 +74,6 @@ install: country.dat vznet.conf vzdump.conf vzdump-hook-script.pl pve-apt.conf m install -D -m 0644 pve-sources.list ${DESTDIR}/etc/apt/sources.list.d/pve-enterprise.list install -D -m 0644 pve-blacklist.conf ${DESTDIR}/etc/modprobe.d/pve-blacklist.conf install -D -m 0644 vzdump.conf ${DESTDIR}/etc/vzdump.conf - install -D -m 0755 vznet.conf ${DESTDIR}/etc/vz/vznet.conf install -D -m 0755 mtu ${DESTDIR}/etc/network/if-up.d/mtu install -D -m 0755 bridgevlan ${DESTDIR}/etc/network/if-up.d/bridgevlan install -D -m 0755 bridgevlanport ${DESTDIR}/etc/network/if-up.d/bridgevlanport diff --git a/debian/conffiles b/debian/conffiles index 7ad1dd65..d2f93716 100644 --- a/debian/conffiles +++ b/debian/conffiles @@ -3,7 +3,6 @@ /etc/init.d/pveproxy /etc/init.d/spiceproxy /etc/init.d/pvestatd -/etc/vz/vznet.conf /etc/vzdump.conf /etc/logrotate.d/pve /etc/apt/apt.conf.d/75pveconf diff --git a/vznet.conf b/vznet.conf deleted file mode 100644 index 526a259d..00000000 --- a/vznet.conf +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -EXTERNAL_SCRIPT="/usr/sbin/vznetaddbr"