remove the LXCPATH/<name>/nsgroup file

There is no more need of this file so remove it.

Signed-off-by: Michel Normand <normand@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c
index fc13d991c8ec09c458a1e48095a36011743e5b75..aa06dd54874edfc0f221a293e4f2380164ce9e41 100644 (file)
--- a/src/lxc/cgroup.c
+++ b/src/lxc/cgroup.c
@@ -119,23 +119,7 @@ int lxc_rename_nsgroup(const char *name, struct lxc_handler *handler)
        return ret;
 }
 
-int lxc_link_nsgroup(const char *name, const char *nsgroup)
-{
-       char lxc[MAXPATHLEN];
-       int ret;
-
-       snprintf(lxc, MAXPATHLEN, LXCPATH "/%s/nsgroup", name);
-
-       unlink(lxc);
-       ret = symlink(nsgroup, lxc);
-       if (ret)
-               SYSERROR("failed to create symlink %s->%s", nsgroup, lxc);
-       else
-               DEBUG("'%s' linked to '%s'", nsgroup, lxc);
-
-       return ret;
-}
-
+#warning keep lxc_unlink_nsgroup fct to be able to destroy old created container.
 int lxc_unlink_nsgroup(const char *name)
 {
        char nsgroup[MAXPATHLEN];

diff --git a/src/lxc/cgroup.h b/src/lxc/cgroup.h
index cc125b2d60dc23c36e675c3cfb1b8f76f42e008d..88791bed802b0d681c5246ba164db37837dfd58e 100644 (file)
--- a/src/lxc/cgroup.h
+++ b/src/lxc/cgroup.h
@@ -26,9 +26,7 @@
 #define MAXPRIOLEN 24
 
 struct lxc_handler;
-int lxc_get_cgroup_mount(const char *mtab, char *mnt);
 int lxc_rename_nsgroup(const char *name, struct lxc_handler *handler);
-int lxc_link_nsgroup(const char *name, const char *nsgroup);
 int lxc_unlink_nsgroup(const char *name);
 int lxc_cgroup_path_get(char **path, const char *name);
 

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 1e2a28f0b6ccbe672cac819127b7d6794307a8c6..2447b2d5fd3ec4a602ca7090bde2ca3e1d18175b 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -424,8 +424,7 @@ int lxc_spawn(const char *name, struct lxc_handler *handler, char *const argv[])
                goto out_abort;
        }
 
-       if (lxc_rename_nsgroup(name, handler) ||
-           lxc_link_nsgroup(name, handler->nsgroup))
+       if (lxc_rename_nsgroup(name, handler))
                goto out_abort;
 
        /* Create the network configuration */