This should let us get rid of some ifdefed code and reduce
chances for bad config combinations. There's really no reason
to support it.
Signed-off-by: Serge E. Hallyn <serue@xxxxxxxxxx>
---
checkpoint/Kconfig | 5 +++++
checkpoint/namespace.c | 10 ----------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/checkpoint/Kconfig b/checkpoint/Kconfig
index 4a2c845..549668e 100644
--- a/checkpoint/Kconfig
+++ b/checkpoint/Kconfig
@@ -9,6 +9,11 @@ config DEFERQUEUE
config CHECKPOINT
bool "Checkpoint/restart (EXPERIMENTAL)"
depends on CHECKPOINT_SUPPORT && EXPERIMENTAL
+ depends on UTS_NS
+ depends on USER_NS
+ depends on PID_NS
+ depends on NET_NS
+ depends on DEVPTS_MULTIPLE_INSTANCES
depends on CGROUP_FREEZER
select DEFERQUEUE
help
diff --git a/checkpoint/namespace.c b/checkpoint/namespace.c
index 4b3ac5a..6389dbd 100644
--- a/checkpoint/namespace.c
+++ b/checkpoint/namespace.c
@@ -63,7 +63,6 @@ static struct uts_namespace *do_restore_uts_ns(struct ckpt_ctx *ctx)
if (IS_ERR(h))
return (struct uts_namespace *) h;
-#ifdef CONFIG_UTS_NS
uts_ns = create_uts_ns();
if (!uts_ns) {
uts_ns = ERR_PTR(-ENOMEM);
@@ -78,15 +77,6 @@ static struct uts_namespace *do_restore_uts_ns(struct ckpt_ctx *ctx)
memcpy(name->machine, h->machine, sizeof(name->machine));
memcpy(name->domainname, h->domainname, sizeof(name->domainname));
up_read(&uts_sem);
-#else
- /* complain if image contains multiple namespaces */
- if (ctx->stats.uts_ns) {
- uts_ns = ERR_PTR(-EEXIST);
- goto out;
- }
- uts_ns = current->nsproxy->uts_ns;
- get_uts_ns(uts_ns);
-#endif
ctx->stats.uts_ns++;
out:
--
1.6.1
_______________________________________________
Containers mailing list
Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/containers
