Skip to contentSkip to conversation

lxc/namespace: Clean up kernel configs

PATCH New Yang Shi 1 participant 1 message Oct 17, 2013

lore
Share & tools
lore

Yang Shi

author
#0 lore raw

PATCH 1/1 lxc/namespace: Clean up kernel configs

Remove namespaces-experimental.cfg since USER_NS is not experimental anymore.

Add CONFIG_USER_NS into namespaces.cfg.

Add CONFIG_MACVLAN into lxc to avoid the below missing report from lxc-checkconfig:

---
 meta/cfg/kernel-cache/features/lxc/lxc.cfg                         | 3 ++-
 .../kernel-cache/features/namespaces/namespaces-experimental.cfg   | 1 -
 meta/cfg/kernel-cache/features/namespaces/namespaces.cfg           | 2 +-
 meta/cfg/kernel-cache/features/namespaces/namespaces.scc           | 7 +------
 4 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 meta/cfg/kernel-cache/features/namespaces/namespaces-experimental.cfg
meta/cfg/kernel-cache/features/lxc/lxc.cfg +2 -1
index dfd7847..740b800 100644
@@ -1,4 +1,5 @@
 # Misc configs
 CONFIG_VETH=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_MM_OWNER=y
\ No newline at end of file
+CONFIG_MM_OWNER=y
+CONFIG_MACVLAN=y
meta/cfg/kernel-cache/features/namespaces/namespaces-experimental.cfg deleted +0 -1
deleted file mode 100644
index 416bd53..0000000
@@ -1 +0,0 @@
-CONFIG_USER_NS=y
meta/cfg/kernel-cache/features/namespaces/namespaces.cfg +1 -1
index 6e850fe..6254019 100644
@@ -1,6 +1,6 @@
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
-
+CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
meta/cfg/kernel-cache/features/namespaces/namespaces.scc +1 -6
index 1328400..ea23151 100644
@@ -1,9 +1,4 @@
-define KFEATURE_DESCRIPTION "Enable namespace support + experimental namespaces"
+define KFEATURE_DESCRIPTION "Enable namespace support"
 define KFEATURE_COMPATIBILITY all
 
-define EXPERIMENTAL 1
-
 kconf non-hardware namespaces.cfg
-if [ -n "EXPERIMENTAL" ]; then
-    kconf non-hardware namespaces-experimental.cfg
-fi
Signature · 1 line
1.8.3.4