update to latest version from git

diff --git a/Makefile b/Makefile
index 031b8401723a5b364a2078d221871dee3f55b3a3..aafd51a943264ff2877923770b13082b8e7aac34 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=4.0
 
 PACKAGE=lxc-pve
 LXCVER=1.1.2
-DEBREL=1
+DEBREL=2
 
 SRCDIR=lxc
 SRCTAR=${SRCDIR}.tgz

diff --git a/debian/changelog b/debian/changelog
index 5b94a8e24b90987f6bf65217e7880398d8abfa3b..4478539dff59b7de52e9fb34f49459a35c07e7d2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lxc (1.1.2-2) unstable; urgency=medium
+
+  * update to latest version from git
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 22 Jul 2015 09:34:18 +0200
+
 lxc (1.1.2-1) unstable; urgency=medium
 
   * update to latest version from git

diff --git a/debian/patches/do-dot-call-chown_mapped_root-on-etc-pve.patch b/debian/patches/do-dot-call-chown_mapped_root-on-etc-pve.patch
index c02c71b12ed5aa00ab1f22753ae4f30f7f76bf9d..6b0ffeac7a6769b3af81d366e37742cd15a5f78a 100644 (file)
--- a/debian/patches/do-dot-call-chown_mapped_root-on-etc-pve.patch
+++ b/debian/patches/do-dot-call-chown_mapped_root-on-etc-pve.patch
@@ -2,7 +2,7 @@ Index: new/src/lxc/lxccontainer.c
 ===================================================================
 --- new.orig/src/lxc/lxccontainer.c
 +++ new/src/lxc/lxccontainer.c
-@@ -862,6 +862,11 @@ static int do_create_container_dir(const
+@@ -870,6 +870,11 @@ static int do_create_container_dir(const
                        return -1;
                }
        }

diff --git a/debian/patches/do-not-use-config-path-for-rootfs.patch b/debian/patches/do-not-use-config-path-for-rootfs.patch
index e1031bc1296ec1a450aa80666136015f2f6096fc..9fb5d6718e260eea097ebeee4d59b07df38a62af 100644 (file)
--- a/debian/patches/do-not-use-config-path-for-rootfs.patch
+++ b/debian/patches/do-not-use-config-path-for-rootfs.patch
@@ -2,7 +2,7 @@ Index: new/src/lxc/lxccontainer.c
 ===================================================================
 --- new.orig/src/lxc/lxccontainer.c
 +++ new/src/lxc/lxccontainer.c
-@@ -916,10 +916,10 @@ static struct bdev *do_bdev_create(struc
+@@ -924,10 +924,10 @@ static struct bdev *do_bdev_create(struc
                dest = alloca(len);
                ret = snprintf(dest, len, "%s", rpath);
        } else {

diff --git a/debian/patches/fix-criu-path.patch b/debian/patches/fix-criu-path.patch
deleted file mode 100644 (file)
index 2ac2ff6..0000000
--- a/debian/patches/fix-criu-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: new/src/lxc/criu.c
-===================================================================
---- new.orig/src/lxc/criu.c
-+++ new/src/lxc/criu.c
-@@ -229,7 +229,7 @@ static bool criu_version_ok()
-               if (dup2(pipes[1], STDOUT_FILENO) < 0)
-                       exit(1);
- 
--              execv("/usr/local/sbin/criu", args);
-+              execv("/usr/sbin/criu", args);
-               exit(1);
-       } else {
-               FILE *f;

diff --git a/debian/patches/fix-systemd-service-depends.patch b/debian/patches/fix-systemd-service-depends.patch
index e7027a2f155b2314cab1099f5759f8fd8e6635c2..ac45687cdedcbc432ec371a9fd9c0cf77e155c97 100644 (file)
--- a/debian/patches/fix-systemd-service-depends.patch
+++ b/debian/patches/fix-systemd-service-depends.patch
@@ -5,8 +5,8 @@ Index: new/config/init/systemd/lxc.service.in
 @@ -1,6 +1,6 @@
  [Unit]
  Description=LXC Container Initialization and Autoboot Code
--After=syslog.target network.target
-+After=syslog.service network.target
+-After=syslog.target network.target lxc-net.service
++After=syslog.service network.target lxc-net.service
  Wants=lxc-net.service
  
  [Service]

diff --git a/debian/patches/series b/debian/patches/series
index 247785d4d81cb413d820608e72d29043d1f9ab3a..5c403325cc5bd0bb14df1efb360f284395ac03ac 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ do-dot-call-chown_mapped_root-on-etc-pve.patch
 use-var-lib-vz-as-default-dir.patch
 do-not-use-config-path-for-rootfs.patch
 run-lxcnetaddbr.patch
-fix-criu-path.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 5508f0d66743c15d8fda556cc61d881985b91a73..67f0b6296680b1e75ef7b825a88b3cf279936465 100644 (file)
--- a/debian/patches/use-var-lib-vz-as-default-dir.patch
+++ b/debian/patches/use-var-lib-vz-as-default-dir.patch
@@ -2,7 +2,7 @@ Index: new/src/lxc/bdev.c
 ===================================================================
 --- new.orig/src/lxc/bdev.c
 +++ new/src/lxc/bdev.c
-@@ -3519,6 +3519,8 @@ static struct bdev * do_bdev_create(cons
+@@ -3535,6 +3535,8 @@ static struct bdev * do_bdev_create(cons
        return bdev;
  }
  
@@ -11,7 +11,7 @@ Index: new/src/lxc/bdev.c
  /*
   * bdev_create:
   * Create a backing store for a container.
-@@ -3536,6 +3538,20 @@ struct bdev *bdev_create(const char *des
+@@ -3552,6 +3554,20 @@ struct bdev *bdev_create(const char *des
        struct bdev *bdev;
        char *best_options[] = {"btrfs", "zfs", "lvm", "dir", NULL};
  

diff --git a/lxc.tgz b/lxc.tgz
index e145475bf1eacfb199f33568f1aea7d4efc9ff00..a5f8dc916b750915e90bbec90330d9f68c5a9e22 100644 (file)
Binary files a/lxc.tgz and b/lxc.tgz differ