do not use /etc/pve (use standard lxc directory instead)

diff --git a/debian/patches/series b/debian/patches/series
index 3abfda189e12d9e64e28859354598605336f304e..ef6c8980d5fc23551a654abf0ac15ef877a06f81 100644 (file)
--- 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 7f8e999bb4ac71e87ff2c6449c1b82f566cdb3b9..3027c5c35b1b842eb56c3d3703b44bb7e2b3b474 100755 (executable)
--- 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