From bedae2e42a7c9409b6f4b8d87d90b68146af20df Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 6 Aug 2015 11:24:51 +0200 Subject: [PATCH] do not use /etc/pve (use standard lxc directory instead) --- debian/patches/series | 4 ++-- debian/rules | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index 3abfda1..ef6c898 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,9 +2,9 @@ fix-systemd-service-depends.patch #fix-default-lxc-config.patch remove-systemd-delegate-flag.patch include-linux-sched.patch -do-dot-call-chown_mapped_root-on-etc-pve.patch +#do-dot-call-chown_mapped_root-on-etc-pve.patch use-var-lib-vz-as-default-dir.patch -do-not-use-config-path-for-rootfs.patch +#do-not-use-config-path-for-rootfs.patch run-lxcnetaddbr.patch 0001-seccomp-simplify-and-fix-rule-parsing.patch 0001-pass-on-reboot-flag-and-delete-old-veth-on-reboot.patch diff --git a/debian/rules b/debian/rules index 7f8e999..3027c5c 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,6 @@ override_dh_auto_configure: dh_auto_configure -- \ --with-distro=debian \ --with-init-script=systemd \ - --with-config-path=/etc/pve/lxc \ --enable-apparmor \ --enable-doc \ --enable-api-docs \ @@ -34,10 +33,6 @@ override_dh_strip: override_dh_install: dh_apparmor -p lxc-pve --profile-name=usr.bin.lxc-start - # do not include dirs on /etc/pve - rmdir $(CURDIR)/debian/tmp/etc/pve/lxc - rmdir $(CURDIR)/debian/tmp/etc/pve - dh_install --fail-missing