[pve-devel] [PATCH WIP/test lxc] Update to 2.0.0.rc1 (WIP)

[Fabian Grünbichler]

Drop patches applied upstream
Update use-var-lib-vz-as-default-dir.patch

Note: run "make download" before building to fetch the
upstream release candidate.
---
Update to upstream release candidate for upcoming 2.0.0
release for testing purposes.

 Makefile                                           |  2 +-
 debian/patches/series                              |  9 ---------
 debian/patches/use-var-lib-vz-as-default-dir.patch | 14 +++++++-------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 1ee52bb..ebec0fa 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ deb ${DEBS}: ${SRCTAR}
 .PHONY: download
 download ${SRCTAR}:
 	rm -rf ${SRCDIR} ${SRCTAR}
-	git clone -b stable-1.1 git://github.com/lxc/lxc
+	git clone -b lxc-2.0.0.rc1 git://github.com/lxc/lxc
 	tar czf ${SRCTAR}.tmp ${SRCDIR}
 	mv ${SRCTAR}.tmp ${SRCTAR}
 
diff --git a/debian/patches/series b/debian/patches/series
index b881754..ef8bf7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,13 +6,4 @@ include-linux-sched.patch
 use-var-lib-vz-as-default-dir.patch
 #do-not-use-config-path-for-rootfs.patch
 run-lxcnetaddbr.patch
-0001-added-stop-hook-entries.patch
-0002-run-stop-hook-between-STOPPING-and-STOPPED-states.patch
-0003-pass-namespace-handles-to-the-stop-hook.patch
-0004-document-the-stop-hook.patch
-0005-added-the-unmount-namespace-hook.patch
-0006-hooks-put-binary-hooks-in-usr-lib-lxc-hooks.patch
-delete_network_show_error.diff
 0001-AppArmor-add-make-rslave-to-usr.bin.lxc-start.patch
-0002-Added-lxc.monitor.unshare.patch
-0001-apparmor-allow-binding-run-lock-var-run-lock.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
index 67f0b62..fbc4105 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,9 @@
-Index: new/src/lxc/bdev.c
+Index: new/src/lxc/bdev/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;
+--- new.orig/src/lxc/bdev/bdev.c
++++ new/src/lxc/bdev/bdev.c
+@@ -449,6 +449,8 @@ static struct bdev * do_bdev_create(cons
+ 	return NULL;
  }
  
 +#define PVE_DEFAULT_DIR "/var/lib/vz"
@@ -11,9 +11,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_create(const char *des
  	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;
-- 
2.1.4