mirror of
https://git.proxmox.com/git/mirror_lxc
synced 2025-08-15 00:15:55 +00:00
Merge pull request #3893 from brauner/2021-07-01.fixes.3
cmd/lxc-checkconfig: list cgroup namespaces and rename confusing ns_c…
This commit is contained in:
commit
161b0ff427
@ -24,11 +24,8 @@ is_set() {
|
||||
return $?
|
||||
}
|
||||
|
||||
is_enabled() {
|
||||
mandatory=$2
|
||||
|
||||
is_set $1
|
||||
RES=$?
|
||||
show_enabled() {
|
||||
RES=$1
|
||||
RET=1
|
||||
if [ $RES -eq 0 ]; then
|
||||
$SETCOLOR_SUCCESS && echo -n "enabled" && $SETCOLOR_NORMAL
|
||||
@ -43,6 +40,23 @@ is_enabled() {
|
||||
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() {
|
||||
lsmod | grep $1 > /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
@ -144,6 +158,9 @@ echo "--- Control groups ---"
|
||||
echo -n "Cgroups: " && is_enabled CONFIG_CGROUPS
|
||||
echo
|
||||
|
||||
echo -n "Cgroup namespace: " && has_cgroup_ns
|
||||
echo
|
||||
|
||||
print_cgroups() {
|
||||
# print all mountpoints for cgroup filesystems
|
||||
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: " &&
|
||||
$SETCOLOR_SUCCESS && echo "enabled" && $SETCOLOR_NORMAL
|
||||
else
|
||||
echo -n "Cgroup namespace: " && is_enabled CONFIG_CGROUP_NS yes
|
||||
echo -n "Cgroup ns_cgroup: " && is_enabled CONFIG_CGROUP_NS yes
|
||||
echo
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user