proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 09:48:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

confile: remove lxc.pivotdir

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2017-06-23 15:39:00 +02:00
parent 26a38fb6aa
commit 39b8f404dc
No known key found for this signature in database
GPG Key ID: 7B3C391EFEA93624
4 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/templates/common.conf.in
View File

@ -12,9 +12,6 @@ lxc.tty = 4
# Drop some harmful capabilities # Drop some harmful capabilities
lxc.cap.drop = mac_admin mac_override sys_time sys_module sys_rawio lxc.cap.drop = mac_admin mac_override sys_time sys_module sys_rawio
# Set the pivot directory
lxc.pivotdir = lxc_putold
# Ensure hostname is changed on clone # Ensure hostname is changed on clone
lxc.hook.clone = @LXCHOOKDIR@/clonehostname lxc.hook.clone = @LXCHOOKDIR@/clonehostname

1
src/lxc/conf.h
View File

@ -285,7 +285,6 @@ enum {
/* /*
* Defines the global container configuration * Defines the global container configuration
* @rootfs : root directory to run the container * @rootfs : root directory to run the container
* @pivotdir : pivotdir path, if not set default will be used
* @mount : list of mount points * @mount : list of mount points
* @tty : numbers of tty * @tty : numbers of tty
* @pts : new pts instance * @pts : new pts instance

26
src/lxc/confile.c
View File

@ -172,12 +172,6 @@ static int get_config_rootfs(const char *, char *, int, struct lxc_conf *,
void *); void *);
static int clr_config_rootfs(const char *, struct lxc_conf *, void *); static int clr_config_rootfs(const char *, struct lxc_conf *, void *);
static int set_config_pivotdir(const char *, const char *, struct lxc_conf *,
void *);
static int get_config_pivotdir(const char *, char *, int, struct lxc_conf *,
void *);
static int clr_config_pivotdir(const char *, struct lxc_conf *, void *);
static int set_config_utsname(const char *, const char *, struct lxc_conf *, static int set_config_utsname(const char *, const char *, struct lxc_conf *,
void *); void *);
static int get_config_utsname(const char *, char *, int, struct lxc_conf *, static int get_config_utsname(const char *, char *, int, struct lxc_conf *,
@ -444,7 +438,6 @@ static struct lxc_config_t config[] = {
{ "lxc.rootfs.options", set_config_rootfs_options, get_config_rootfs_options, clr_config_rootfs_options, }, { "lxc.rootfs.options", set_config_rootfs_options, get_config_rootfs_options, clr_config_rootfs_options, },
{ "lxc.rootfs.backend", set_config_rootfs_backend, get_config_rootfs_backend, clr_config_rootfs_backend, }, { "lxc.rootfs.backend", set_config_rootfs_backend, get_config_rootfs_backend, clr_config_rootfs_backend, },
{ "lxc.rootfs", set_config_rootfs, get_config_rootfs, clr_config_rootfs, }, { "lxc.rootfs", set_config_rootfs, get_config_rootfs, clr_config_rootfs, },
{ "lxc.pivotdir", set_config_pivotdir, get_config_pivotdir, clr_config_pivotdir, },
{ "lxc.utsname", set_config_utsname, get_config_utsname, clr_config_utsname, }, { "lxc.utsname", set_config_utsname, get_config_utsname, clr_config_utsname, },
{ "lxc.hook.pre-start", set_config_hooks, get_config_hooks, clr_config_hooks, }, { "lxc.hook.pre-start", set_config_hooks, get_config_hooks, clr_config_hooks, },
{ "lxc.hook.pre-mount", set_config_hooks, get_config_hooks, clr_config_hooks, }, { "lxc.hook.pre-mount", set_config_hooks, get_config_hooks, clr_config_hooks, },
@ -2338,13 +2331,6 @@ static int set_config_rootfs_backend(const char *key, const char *value,
return set_config_string_item(&lxc_conf->rootfs.bdev_type, value); return set_config_string_item(&lxc_conf->rootfs.bdev_type, value);
} }
static int set_config_pivotdir(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data)
{
WARN("lxc.pivotdir is ignored. It will soon become an error.");
return 0;
}
static int set_config_utsname(const char *key, const char *value, static int set_config_utsname(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
@ -3337,12 +3323,6 @@ static int get_config_rootfs_backend(const char *key, char *retv, int inlen,
return lxc_get_conf_str(retv, inlen, c->rootfs.bdev_type); return lxc_get_conf_str(retv, inlen, c->rootfs.bdev_type);
} }
static int get_config_pivotdir(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data)
{
return 0;
}
static int get_config_utsname(const char *key, char *retv, int inlen, static int get_config_utsname(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
@ -3765,12 +3745,6 @@ static inline int clr_config_rootfs_backend(const char *key, struct lxc_conf *c,
return 0; return 0;
} }
static inline int clr_config_pivotdir(const char *key, struct lxc_conf *c,
void *data)
{
return 0;
}
static inline int clr_config_utsname(const char *key, struct lxc_conf *c, static inline int clr_config_utsname(const char *key, struct lxc_conf *c,
void *data) void *data)
{ {

1
templates/lxc-cirros.in
View File

@ -119,7 +119,6 @@ cat >> "$path/config" <<EOF
# Template used to create this container: cirros # Template used to create this container: cirros
lxc.rootfs = $rootfs lxc.rootfs = $rootfs
lxc.pivotdir = lxc_putold
lxc.tty = 4 lxc.tty = 4
lxc.pts = 1024 lxc.pts = 1024