5
0
mirror of git://git.proxmox.com/git/lxc.git synced 2025-03-22 06:50:41 +03:00

drop: use /var/lib/vz as default dir patch

This made lxc-create use /var/lib/vz/private as default
storage which doesn't really make much sense.
(We use images/$vmid/vm-$vmid-disk-$id.subvol/ for size=0
storages and the private/ directory isn't really used at all
anymore).
This commit is contained in:
Wolfgang Bumiller 2016-11-15 10:19:26 +01:00
parent 26d605de81
commit ba95c65bf7
2 changed files with 0 additions and 33 deletions

View File

@ -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

View File

@ -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);