[pve-devel] [PATCH WIP/test lxc 2/4] rebase systemd service patch and var lib vz patch

[Dominik Csapak]

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 debian/patches/fix-systemd-service-depends.patch   |  2 +-
 debian/patches/use-var-lib-vz-as-default-dir.patch | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/patches/fix-systemd-service-depends.patch b/debian/patches/fix-systemd-service-depends.patch
index 4933c58..9149c27 100644
--- a/debian/patches/fix-systemd-service-depends.patch
+++ b/debian/patches/fix-systemd-service-depends.patch
@@ -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
diff --git a/debian/patches/use-var-lib-vz-as-default-dir.patch b/debian/patches/use-var-lib-vz-as-default-dir.patch
index 67f0b62..dce6505 100644
--- a/debian/patches/use-var-lib-vz-as-default-dir.patch
+++ b/debian/patches/use-var-lib-vz-as-default-dir.patch
@@ -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);
  
-- 
2.1.4