bump version to 2.0.8-1

[lxc.git] / debian / patches / 0006-start-initutils-make-cgroupns-separation-level-confi.patch

diff --git a/debian/patches/0006-start-initutils-make-cgroupns-separation-level-confi.patch b/debian/patches/0006-start-initutils-make-cgroupns-separation-level-confi.patch
index ca114dad5c5b63a142827dc225456fd4de38e183..739cf9f00a8bb563416c6f8c050273e8257a2d6b 100644 (file)
--- a/debian/patches/0006-start-initutils-make-cgroupns-separation-level-confi.patch
+++ b/debian/patches/0006-start-initutils-make-cgroupns-separation-level-confi.patch
@@ -1,7 +1,7 @@
-From af72260927efd412210ec85842e1ef70ccc0c5e8 Mon Sep 17 00:00:00 2001
+From 2b4c8a851ae299a840af3e5e0cdf128ea205b5a4 Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Wed, 16 Nov 2016 09:53:42 +0100
-Subject: [PATCH 6/9] start/initutils: make cgroupns separation level
+Subject: [PATCH 6/8] start/initutils: make cgroupns separation level
  configurable
 
 Adds a new global config variable `lxc.cgroup.separate`
@@ -17,7 +17,7 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
  3 files changed, 26 insertions(+), 20 deletions(-)
 
 diff --git a/src/lxc/initutils.c b/src/lxc/initutils.c
-index 8d9016c..0630293 100644
+index 8d9016cd..06302935 100644
 --- a/src/lxc/initutils.c
 +++ b/src/lxc/initutils.c
 @@ -88,14 +88,15 @@ static char *copy_global_config_value(char *p)
@@ -45,7 +45,7 @@ index 8d9016c..0630293 100644
        };
  
 diff --git a/src/lxc/initutils.h b/src/lxc/initutils.h
-index c021fd6..443ad02 100644
+index c021fd61..443ad026 100644
 --- a/src/lxc/initutils.h
 +++ b/src/lxc/initutils.h
 @@ -43,6 +43,7 @@
@@ -57,10 +57,10 @@ index c021fd6..443ad02 100644
  extern void lxc_setup_fs(void);
  extern const char *lxc_global_config_value(const char *option_name);
 diff --git a/src/lxc/start.c b/src/lxc/start.c
-index e889421..4217c5d 100644
+index 2d7df0e7..a909c631 100644
 --- a/src/lxc/start.c
 +++ b/src/lxc/start.c
-@@ -1050,6 +1050,7 @@ static int lxc_spawn(struct lxc_handler *handler)
+@@ -1061,6 +1061,7 @@ static int lxc_spawn(struct lxc_handler *handler)
        int saved_ns_fd[LXC_NS_MAX];
        int preserve_mask = 0, i, flags;
        int netpipepair[2], nveths;
@@ -68,7 +68,7 @@ index e889421..4217c5d 100644
  
        netpipe = -1;
  
-@@ -1113,7 +1114,7 @@ static int lxc_spawn(struct lxc_handler *handler)
+@@ -1124,7 +1125,7 @@ static int lxc_spawn(struct lxc_handler *handler)
         * it readonly.
         * If the container is unprivileged then skip rootfs pinning.
         */
@@ -77,7 +77,7 @@ index e889421..4217c5d 100644
                handler->pinfd = pin_rootfs(handler->conf->rootfs.path);
                if (handler->pinfd == -1)
                        INFO("Failed to pin the rootfs for container \"%s\".", handler->name);
-@@ -1238,17 +1239,20 @@ static int lxc_spawn(struct lxc_handler *handler)
+@@ -1249,17 +1250,20 @@ static int lxc_spawn(struct lxc_handler *handler)
        }
  
        if (cgns_supported()) {
@@ -110,5 +110,5 @@ index e889421..4217c5d 100644
        }
  
 -- 
-2.1.4
+2.11.0