</description>
</boolean>
+ <boolean id="global-namespace-cleanup" name="namespace-cleanup">
+ <description>
+Enable namespace cleanup globally. It can be overridden for a single vserver
+by setting the <optionref ref="global-nonamespace-cleanup">nonamespace-cleanup</optionref> flag
+there.
+ </description>
+ </boolean>
+
<link name="run.rev">
<description>
Path of the vserver run reverse directory. This directory contains
</description>
</boolean>
+ <boolean id="global-nonamespace-cleanup" name="nonamespace-cleanup">
+ <description>
+Overrides the global <optionref ref="global-namespace-cleanup">namespace-cleanup</optionref> flag and disables
+namespace cleanup for the current vserver.
+ </description>
+ </boolean>
+
+ <boolean name="namespace-cleanup">
+ <description>
+Enable namespace cleanup for the current vserver.
+ </description>
+ </boolean>
+
<hash name="schedule">
<description>
[experimental; name is subject of possible change] Contains the
-e "$cfgdir"/nonamespace
}
+function isNamespaceCleanup
+{
+ local cfgdir
+
+ $_VSERVER_INFO - FEATURE namespace || return 1
+ cfgdir=$($_VSERVER_INFO "$1" CFGDIR) || return 1
+ test -e "$cfgdir"/nonamespace-cleanup && return 1
+ test -e "$__CONFDIR"/.defaults/namespace-cleanup -o \
+ -e "$cfgdir"/namespace-cleanup && return 0
+ return 1
+}
+
## Usage: getAllVservers <var> [<KIND>*]
function getAllVservers
{
test -n "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir"
- test -z "$NAMESPACE_CLEANUP" || isAvoidNamespace "$cfgdir" || \
- $_VNAMESPACE --cleanup
-
_mountVserverInternal "$cfgdir"/fstab
_mountVserverInternal "$cfgdir"/fstab.local
_mountVserverInternal "$cfgdir"/fstab.remote $_CHBIND "${CHBIND_OPTS[@]}"
+ isNamespaceCleanup "$cfgdir" && \
+ _namespaceCleanup
+
isAvoidNamespace "$cfgdir" || \
$_SECURE_MOUNT --rbind -n "$vdir" "/"
}
_saveSingleDiskLimit "$vdir" "$dlimit"
done
}
+
+function _namespaceCleanup
+{
+ local root=$(readlink -f "$vdir")
+ local tmp="$root"
+ local -a list
+ while [ "$tmp" ]; do
+ list=( "${list[@]}" "$tmp" )
+ tmp="${tmp%/*}"
+ done
+ local -a list_umount
+ while read dev path opts; do
+ [ "$path" ] || continue
+ for i in "$root" /dev /proc; do
+ [ "${path#$i}" != "$path" ] && continue 2
+ done
+ for i in "${list[@]}" /; do
+ [ "$path" = "$i" ] && continue 2
+ done
+ list_umount=( "${list_umount[@]}" "$path" )
+ done < /proc/mounts
+ for i in "${list_umount[@]}"; do
+ umount -l -n "$i"
+ done
+}
+