summaryrefslogtreecommitdiffstats
path: root/criu-no-expert.patch
diff options
context:
space:
mode:
Diffstat (limited to 'criu-no-expert.patch')
-rw-r--r--criu-no-expert.patch20
1 files changed, 15 insertions, 5 deletions
diff --git a/criu-no-expert.patch b/criu-no-expert.patch
index 2124427e9..f7e1ffff1 100644
--- a/criu-no-expert.patch
+++ b/criu-no-expert.patch
@@ -1,22 +1,32 @@
+From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
+Date: Wed, 30 Jan 2013 10:55:31 -0500
+Subject: [PATCH] criu: no expert
+
+Bugzilla: N/A
+Upstream-status: Fedora mustard
+---
+ init/Kconfig | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
diff --git a/init/Kconfig b/init/Kconfig
-index be8b7f5..7461760 100644
+index 648bb79d6b73..860ca236975f 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP
+@@ -1137,7 +1137,7 @@ config CGROUP_WRITEBACK
endif # CGROUPS
config CHECKPOINT_RESTORE
- bool "Checkpoint/restore support" if EXPERT
+ bool "Checkpoint/restore support"
+ select PROC_CHILDREN
default n
help
- Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE
+@@ -1149,7 +1149,7 @@ config CHECKPOINT_RESTORE
If unsure, say N here.
menuconfig NAMESPACES
- bool "Namespaces support" if EXPERT
+ bool "Namespaces support"
+ depends on MULTIUSER
default !EXPERT
help
- Provides the way to make tasks work with different objects using