mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-03 22:29:30 +00:00
Code Issues Releases Wiki Activity

cmd/lxc-checkconfig: list cgroup namespaces and rename confusing ns_cgroup entry

Browse Source 
Link: https://discuss.linuxcontainers.org/t/cgroup-namespace-required-in-lxc-checkconfig-and-config-cgroup-ns
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner
2021-07-01 13:39:46 +02:00
parent 49f1fbec16
commit 01dd32bf95
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/lxc/cmd/lxc-checkconfig.in
View File

@@ -24,11 +24,8 @@ is_set() {
return $? return $?
} }
is_enabled() { show_enabled() {
mandatory=$2 RES=$1
is_set $1
RES=$?
RET=1 RET=1
if [ $RES -eq 0 ]; then if [ $RES -eq 0 ]; then
$SETCOLOR_SUCCESS && echo -n "enabled" && $SETCOLOR_NORMAL $SETCOLOR_SUCCESS && echo -n "enabled" && $SETCOLOR_NORMAL
@@ -43,6 +40,23 @@ is_enabled() {
return $RET return $RET
} }
is_enabled() {
mandatory=$2
is_set $1
show_enabled $?
}
has_cgroup_ns() {
mandatory=no
if [ -f "/proc/self/ns/cgroup" ]; then
show_enabled 0
else
show_enabled 1
fi
}
is_probed() { is_probed() {
lsmod | grep $1 > /dev/null lsmod | grep $1 > /dev/null
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@@ -144,6 +158,9 @@ echo "--- Control groups ---"
echo -n "Cgroups: " && is_enabled CONFIG_CGROUPS echo -n "Cgroups: " && is_enabled CONFIG_CGROUPS
echo echo
echo -n "Cgroup namespace: " && has_cgroup_ns
echo
print_cgroups() { print_cgroups() {
# print all mountpoints for cgroup filesystems # print all mountpoints for cgroup filesystems
awk '$1 !~ /#/ && $3 == mp { print $2; } ; END { exit(0); } ' "mp=$1" "$2" ; awk '$1 !~ /#/ && $3 == mp { print $2; } ; END { exit(0); } ' "mp=$1" "$2" ;
@@ -179,7 +196,7 @@ if [ -f $CGROUP_MNT_PATH/cgroup.clone_children ]; then
echo -n "Cgroup v1 clone_children flag: " && echo -n "Cgroup v1 clone_children flag: " &&
$SETCOLOR_SUCCESS && echo "enabled" && $SETCOLOR_NORMAL $SETCOLOR_SUCCESS && echo "enabled" && $SETCOLOR_NORMAL
else else
echo -n "Cgroup namespace: " && is_enabled CONFIG_CGROUP_NS yes echo -n "Cgroup ns_cgroup: " && is_enabled CONFIG_CGROUP_NS yes
echo echo
fi fi