Commit ef184f8c by Daniel Lezcano Committed by Daniel Lezcano

fix cpuset configuration with smp only

Do not check CPUSET configuration when SMP is not enabled. Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent 9eb09f87
...@@ -9,9 +9,17 @@ SETCOLOR_FAILURE="echo -en \\033[1;31m" ...@@ -9,9 +9,17 @@ SETCOLOR_FAILURE="echo -en \\033[1;31m"
SETCOLOR_WARNING="echo -en \\033[1;33m" SETCOLOR_WARNING="echo -en \\033[1;33m"
SETCOLOR_NORMAL="echo -en \\033[0;39m" SETCOLOR_NORMAL="echo -en \\033[0;39m"
is_set() {
$GREP -q "$1=[y|m]" $CONFIG
RES=$?
return $?
}
is_enabled() { is_enabled() {
mandatory=$2 mandatory=$2
$GREP -q "$1=[y|m]" $CONFIG
is_set $1
RES=$? RES=$?
if [ $RES = 0 ]; then if [ $RES = 0 ]; then
...@@ -54,13 +62,13 @@ echo -n "Network namespace: " && is_enabled CONFIG_NET_NS ...@@ -54,13 +62,13 @@ echo -n "Network namespace: " && is_enabled CONFIG_NET_NS
echo -n "Multiple /dev/pts instances: " && is_enabled DEVPTS_MULTIPLE_INSTANCES echo -n "Multiple /dev/pts instances: " && is_enabled DEVPTS_MULTIPLE_INSTANCES
echo echo
echo "--- Control groups ---" echo "--- Control groups ---"
echo -n "Cgroup: " && is_enabled CONFIG_CGROUPS echo -n "Cgroup: " && is_enabled CONFIG_CGROUPS yes
echo -n "Cgroup namespace: " && is_enabled CONFIG_CGROUP_NS echo -n "Cgroup namespace: " && is_enabled CONFIG_CGROUP_NS
echo -n "Cgroup device: " && is_enabled CONFIG_CGROUP_DEVICE echo -n "Cgroup device: " && is_enabled CONFIG_CGROUP_DEVICE
echo -n "Cgroup sched: " && is_enabled CONFIG_CGROUP_SCHED echo -n "Cgroup sched: " && is_enabled CONFIG_CGROUP_SCHED
echo -n "Cgroup cpu account: " && is_enabled CONFIG_CGROUP_CPUACCT echo -n "Cgroup cpu account: " && is_enabled CONFIG_CGROUP_CPUACCT
echo -n "Cgroup memory controller: " && is_enabled CONFIG_CGROUP_MEM_RES_CTLR echo -n "Cgroup memory controller: " && is_enabled CONFIG_CGROUP_MEM_RES_CTLR
echo -n "Cgroup cpuset: " && is_enabled CONFIG_CPUSETS is_set CONFIG_SMP && echo -n "Cgroup cpuset: " && is_enabled CONFIG_CPUSETS
echo echo
echo "--- Misc ---" echo "--- Misc ---"
echo -n "Veth pair device: " && is_enabled CONFIG_VETH echo -n "Veth pair device: " && is_enabled CONFIG_VETH
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment