diff --git a/debian/patches/series b/debian/patches/series index 29bdbb6..a3ab4fb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ fix-systemd-service-depends.patch remove-systemd-delegate-flag.patch -use-var-lib-vz-as-default-dir.patch run-lxcnetaddbr.patch deny-rw-mounting-of-sys-and-proc.patch phynet-rename.patch diff --git a/debian/patches/use-var-lib-vz-as-default-dir.patch b/debian/patches/use-var-lib-vz-as-default-dir.patch deleted file mode 100644 index dce6505..0000000 --- a/debian/patches/use-var-lib-vz-as-default-dir.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/src/lxc/bdev/bdev.c -+++ b/src/lxc/bdev/bdev.c -@@ -449,6 +449,8 @@ - return NULL; - } - -+#define PVE_DEFAULT_DIR "/var/lib/vz" -+ - /* - * bdev_create: - * Create a backing store for a container. -@@ -466,6 +468,20 @@ - struct bdev *bdev; - char *best_options[] = {"btrfs", "zfs", "lvm", "dir", "rbd", NULL}; - -+ if ((!type || (strcmp(type, "dir") == 0)) && !specs->dir) { -+ int len = strlen(PVE_DEFAULT_DIR) + strlen(cname) + strlen("private") + 3; -+ specs->dir = malloc(len); -+ if (!specs->dir) { -+ return NULL; -+ } -+ int ret = snprintf(specs->dir, len, "%s/private/%s", PVE_DEFAULT_DIR, cname); -+ if (ret < 0 || ret >= len) { -+ free(specs->dir); -+ specs->dir = NULL; -+ return NULL; -+ } -+ } -+ - if (!type) - return do_bdev_create(dest, "dir", cname, specs); -