confile: remove lxc.pivotdir

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/config/templates/common.conf.in b/config/templates/common.conf.in
index c1deadec1a019346ff4d947caf77f7d0198441e4..fdfd790680190fed93d6ee0dd8aee7119c07da36 100644 (file)
--- a/config/templates/common.conf.in
+++ b/config/templates/common.conf.in
@@ -12,9 +12,6 @@ lxc.tty = 4
 # Drop some harmful capabilities
 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
 lxc.hook.clone = @LXCHOOKDIR@/clonehostname
 

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index 24659b54bdbbdb504eda6661769a375412224846..4bf0aa56ffcfd3b7a24af9b89a8eb1c481685abf 100644 (file)
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -285,7 +285,6 @@ enum {
 /*
  * Defines the global container configuration
  * @rootfs     : root directory to run the container
- * @pivotdir   : pivotdir path, if not set default will be used
  * @mount      : list of mount points
  * @tty        : numbers of tty
  * @pts        : new pts instance

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index fec1d563832b39ce1d72becf37cdc18cb6416bac..6d17bb7f351749f15c641fd914abf75939c18c4f 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -172,12 +172,6 @@ static int get_config_rootfs(const char *, char *, int, 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 *,
                              void *);
 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.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.pivotdir",                  set_config_pivotdir,                    get_config_pivotdir,                    clr_config_pivotdir,                  },
        { "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-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);
 }
 
-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,
                              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);
 }
 
-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,
                              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;
 }
 
-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,
                                     void *data)
 {

diff --git a/templates/lxc-cirros.in b/templates/lxc-cirros.in
index 395416ba2a30cfca184892ef67147d3390d7bb8c..1bfedda50e6634f4f88590b1bebe5b65aa596c07 100644 (file)
--- a/templates/lxc-cirros.in
+++ b/templates/lxc-cirros.in
@@ -119,7 +119,6 @@ cat >> "$path/config" <<EOF
 # Template used to create this container: cirros
 
 lxc.rootfs = $rootfs
-lxc.pivotdir = lxc_putold
 
 lxc.tty = 4
 lxc.pts = 1024