mirror of
git://git.proxmox.com/git/lxc.git
synced 2025-03-23 10:50:23 +03:00
packaging: drop old unused patch files
This commit is contained in:
parent
f34b928943
commit
26d605de81
@ -1,16 +0,0 @@
|
||||
Index: new/src/lxc/lxccontainer.c
|
||||
===================================================================
|
||||
--- new.orig/src/lxc/lxccontainer.c
|
||||
+++ new/src/lxc/lxccontainer.c
|
||||
@@ -870,6 +870,11 @@ static int do_create_container_dir(const
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
+
|
||||
+ /* it is not possible to set ownership on /etc/pve */
|
||||
+ if (strncmp(path, "/etc/pve/lxc/", 12) == 0)
|
||||
+ return ret;
|
||||
+
|
||||
strcpy(p, path);
|
||||
if (!lxc_list_empty(&conf->id_map) && chown_mapped_root(p, conf) != 0) {
|
||||
ERROR("Failed to chown container dir");
|
@ -1,18 +0,0 @@
|
||||
Index: new/src/lxc/lxccontainer.c
|
||||
===================================================================
|
||||
--- new.orig/src/lxc/lxccontainer.c
|
||||
+++ new/src/lxc/lxccontainer.c
|
||||
@@ -924,10 +924,10 @@ static struct bdev *do_bdev_create(struc
|
||||
dest = alloca(len);
|
||||
ret = snprintf(dest, len, "%s", rpath);
|
||||
} else {
|
||||
- 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;
|
||||
dest = alloca(len);
|
||||
- ret = snprintf(dest, len, "%s/%s/rootfs", lxcpath, c->name);
|
||||
+ ret = snprintf(dest, len, "%s/%s/rootfs", rootfs_path, c->name);
|
||||
}
|
||||
if (ret < 0 || ret >= len)
|
||||
return NULL;
|
9
debian/patches/fix-default-lxc-config.patch
vendored
9
debian/patches/fix-default-lxc-config.patch
vendored
@ -1,9 +0,0 @@
|
||||
Index: new/config/etc/default.conf.unknown
|
||||
===================================================================
|
||||
--- new.orig/config/etc/default.conf.unknown
|
||||
+++ new/config/etc/default.conf.unknown
|
||||
@@ -1 +1,4 @@
|
||||
lxc.network.type = empty
|
||||
+lxc.id_map = u 0 100000 65536
|
||||
+lxc.id_map = g 0 100000 65536
|
||||
+
|
18
debian/patches/include-linux-sched.patch
vendored
18
debian/patches/include-linux-sched.patch
vendored
@ -1,18 +0,0 @@
|
||||
Index: new/src/lxc/namespace.h
|
||||
===================================================================
|
||||
--- new.orig/src/lxc/namespace.h
|
||||
+++ new/src/lxc/namespace.h
|
||||
@@ -23,10 +23,12 @@
|
||||
#ifndef __LXC_NAMESPACE_H
|
||||
#define __LXC_NAMESPACE_H
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
#include <sys/syscall.h>
|
||||
+#include <linux/sched.h>
|
||||
#include <sched.h>
|
||||
|
||||
-#include "config.h"
|
||||
|
||||
#ifndef CLONE_FS
|
||||
# define CLONE_FS 0x00000200
|
4
debian/patches/series
vendored
4
debian/patches/series
vendored
@ -1,10 +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
|
||||
#do-not-use-config-path-for-rootfs.patch
|
||||
run-lxcnetaddbr.patch
|
||||
deny-rw-mounting-of-sys-and-proc.patch
|
||||
phynet-rename.patch
|
||||
|
Loading…
x
Reference in New Issue
Block a user