Proxmox/lxc
5
0
Fork 0
mirror of git://git.proxmox.com/git/lxc.git synced 2025-03-24 14:50:23 +03:00
Code Releases Activity

rebase systemd service patch and var lib vz patch

Browse Source 
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2016-07-12 09:27:43 +02:00 committed by Wolfgang Bumiller
parent a4ec66d521
commit 8795c71491
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/patches/fix-systemd-service-depends.patch vendored
View File

@ -5,7 +5,7 @@ Index: new/config/init/systemd/lxc.service.in
@@ -1,7 +1,7 @@
[Unit]
Description=LXC Container Initialization and Autoboot Code
-After=syslog.target network.target lxc-net.service
-After=network.target lxc-net.service
-Wants=lxc-net.service
+After=syslog.service network.target lxc-net.service cgmanager.service
+Wants=lxc-net.service cgmanager.service

16
debian/patches/use-var-lib-vz-as-default-dir.patch vendored
View File

@ -1,9 +1,7 @@
Index: new/src/lxc/bdev.c
===================================================================
--- new.orig/src/lxc/bdev.c
+++ new/src/lxc/bdev.c
@@ -3535,6 +3535,8 @@ static struct bdev * do_bdev_create(cons
return bdev;
--- 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"
@ -11,9 +9,9 @@ Index: new/src/lxc/bdev.c
/*
* bdev_create:
* Create a backing store for a container.
@@ -3552,6 +3554,20 @@ struct bdev *bdev_create(const char *des
@@ -466,6 +468,20 @@
struct bdev *bdev;
char *best_options[] = {"btrfs", "zfs", "lvm", "dir", NULL};
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;
@ -28,7 +26,7 @@ Index: new/src/lxc/bdev.c
+ return NULL;
+ }
+ }
+
+
if (!type)
return do_bdev_create(dest, "dir", cname, specs);