update quilte patches

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 891ba801b552cd8ac186105e55666b127ee71133..c02c71b12ed5aa00ab1f22753ae4f30f7f76bf9d 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
-@@ -767,6 +767,11 @@ static int do_create_container_dir(const
+@@ -862,6 +862,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 6efbdc199a886e91f2837f54be475f8981607b9e..e1031bc1296ec1a450aa80666136015f2f6096fc 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,11 +2,11 @@ Index: new/src/lxc/lxccontainer.c
 ===================================================================
 --- new.orig/src/lxc/lxccontainer.c
 +++ new/src/lxc/lxccontainer.c
-@@ -819,10 +819,10 @@ static struct bdev *do_bdev_create(struc
+@@ -916,10 +916,10 @@ static struct bdev *do_bdev_create(struc
                dest = alloca(len);
                ret = snprintf(dest, len, "%s", rpath);
        } else {
--              const char *lxcpath = lxcapi_get_config_path(c);
+-              const char *lxcpath = do_lxcapi_get_config_path(c);
 -              len = strlen(c->name) + strlen(lxcpath) + 9;
 +              const char *rootfs_path = "/var/lib/lxc";
 +              len = strlen(c->name) + strlen(rootfs_path) + 9;

diff --git a/debian/patches/remove-systemd-delegate-flag.patch b/debian/patches/remove-systemd-delegate-flag.patch
new file mode 100644 (file)
index 0000000..ef87da8
--- /dev/null
+++ b/debian/patches/remove-systemd-delegate-flag.patch
@@ -0,0 +1,15 @@
+This flag requires systemd 218 or newer
+
+Index: new/config/init/systemd/lxc.service.in
+===================================================================
+--- new.orig/config/init/systemd/lxc.service.in
++++ new/config/init/systemd/lxc.service.in
+@@ -12,7 +12,7 @@ ExecStart=@LIBEXECDIR@/lxc/lxc-container
+ ExecStop=@LIBEXECDIR@/lxc/lxc-containers stop
+ # Environment=BOOTUP=serial
+ # Environment=CONSOLETYPE=serial
+-Delegate=yes
++#Delegate=yes
+ StandardOutput=syslog
+ StandardError=syslog
+ 

diff --git a/debian/patches/run-lxcnetaddbr.patch b/debian/patches/run-lxcnetaddbr.patch
index 4f7fea20437b28fe07410f3af06919edef62cc75..562a88bd8901540a7de55469d9d409baebbec946 100644 (file)
--- a/debian/patches/run-lxcnetaddbr.patch
+++ b/debian/patches/run-lxcnetaddbr.patch
@@ -2,7 +2,7 @@ Index: new/src/lxc/conf.c
 ===================================================================
 --- new.orig/src/lxc/conf.c
 +++ new/src/lxc/conf.c
-@@ -2669,8 +2669,13 @@ static int instantiate_veth(struct lxc_h
+@@ -2691,8 +2691,13 @@ static int instantiate_veth(struct lxc_h
                                 "veth", veth1, (char*) NULL);
                if (err)
                        goto out_delete;

diff --git a/debian/patches/series b/debian/patches/series
index 0ffd510ed13ef64e65cf349d5927736ca8d13ace..5c403325cc5bd0bb14df1efb360f284395ac03ac 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 fix-systemd-service-depends.patch
 #fix-default-lxc-config.patch
+remove-systemd-delegate-flag.patch
 include-linux-sched.patch
 do-dot-call-chown_mapped_root-on-etc-pve.patch
 use-var-lib-vz-as-default-dir.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 256f127cc825aec396caff449b95fc9c1f617a34..5508f0d66743c15d8fda556cc61d881985b91a73 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
-@@ -3499,6 +3499,8 @@ static struct bdev * do_bdev_create(cons
+@@ -3519,6 +3519,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.
-@@ -3516,6 +3518,20 @@ struct bdev *bdev_create(const char *des
+@@ -3536,6 +3538,20 @@ struct bdev *bdev_create(const char *des
        struct bdev *bdev;
        char *best_options[] = {"btrfs", "zfs", "lvm", "dir", NULL};