# $VSERVER_NAME ... name of vserver
declare -a NICE_CMD=()
+declare -a IONICE_CMD=()
declare -a CHBIND_CMD=()
declare -a CAP_OPTS=()
declare -a CHCONTEXT_INIT_OPTS=()
SILENT_OPT=
+CGROUP_MNT=/dev/cgroup
+CGROUP_SUBSYS=all
+declare -a CGROUP_INHERIT=( cpuset.cpus cpuset.mems )
+
: ${VSERVER_NAME:=$(basename "$VSERVER_DIR")}
if test -e "$VSERVER_DIR"/noisy -o -n "$OPTION_VERBOSE"; then
NICE_CMD=( $_NICE -n $nice )
}
+function _generateIONiceCommand
+{
+ local vdir=$1
+ local ionice_class=2
+ local ionice_priority=0
+
+ test -r "$vdir/ionice/class" && read ionice_class <"$vdir"/ionice/class
+ test -r "$vdir/ionice/priority" && read ionice_priority <"$vdir"/ionice/priority
+
+ IONICE_CMD=( $_IONICE -c$ionice_class -n$ionice_priority )
+}
function _generatePersonalityOptions
{
test -n "$RUNLEVEL_START" || RUNLEVEL_START="default"
RC_PATH=/usr/sbin:/usr/bin:/sbin:/bin
- INITCMD_START=( env TERM=$TERM /lib/rcscripts/sh/init-vserver.sh "$RUNLEVEL_START" )
+ if test -x "$vdir/vdir/lib/rcscripts/sh/init-vserver.sh"; then
+ RC_WRAP=/lib/rcscripts/sh/init-vserver.sh
+ elif test -x "$vdir/vdir/lib/rc/sh/init-vserver.sh"; then
+ RC_WRAP=/lib/rc/sh/init-vserver.sh
+ else
+ panic "init-vserver.sh not found; aborting"
+ fi
+
+ INITCMD_START=( env TERM=$TERM $RC_WRAP "$RUNLEVEL_START" )
INITCMD_STOP=( env -i PATH=$RC_PATH TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown )
INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmp )
;;
+ (xarch)
+ test -n "$RUNLEVEL_START" || RUNLEVEL_START=3
+ INITCMD_START=( /etc/rc.multi )
+ INITCMD_STOP=( /etc/rc.shutdown )
+ INITCMD_PREPARE=( $_FAKE_RUNLEVEL "$RUNLEVEL_START" /var/run/utmp )
+ ;;
+
(x) ;;
(*) panic "Unknown init-style '$INITSTYLE'; aborting";;
esac
local mac
local extip
local up="up"
+ local peer
_getInterfaceValue ip '' "$iface"
_getInterfaceValue extip '' "$iface" "$iface/.."
_getInterfaceValue name '' "$iface"
_getInterfaceValue scope '' "$iface" "$iface/.."
_getInterfaceValue mac '' "$iface"
+ _getInterfaceValue peer '' "$iface"
test -n "$ip" || { echo $"Can not read ip for '$iface'" >&2; return 1; }
test -n "$dev" -o -e "$iface"/nodev || {
_addInterfaceCmd TUNCTL "$dev" $tun_info
fi
- _addInterfaceCmd IP_ADDR "$ip${prefix:+/$prefix}" $use_bcast ${name:+label "$dev:$name"} dev "$dev"
+ _addInterfaceCmd IP_ADDR "$ip${prefix:+/$prefix}" $use_bcast ${name:+label "$dev:$name"} dev "$dev" ${peer:+peer "$peer"}
#_addInterfaceCmd IP_ROUTE "$ip${prefix:+/$prefix}" dev "$dev"
_addInterfaceCmd IP_LINK "$dev" $up
elif ! test -n "$N_CONTEXT"; then
local vdir="$1"
local d="$vdir"/spaces
- test ! -e "$d"/pid || \
- OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --pid )
+ ( test ! -e "$d"/pid ) || \
+ OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --pid )
test ! -e "$d"/net || {
OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --net )
_generateInterfaceOptions "$1"
test -n "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$1"
_generateNiceCommand "$1"
+ _generateIONiceCommand "$1"
_generateInitOptions "$1"
_generateChcontextOptions "$1"
_generateScheduleOptions "$1"
_generateTagOptions "$1"
_generateMemctrlOptions "$1"
_generateSpaceOptions "$1"
+ _generateCgroupOptions
if test -n "$_IS_FAKEINIT"; then
CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit )
_namespaceCleanup "$cfgdir"
isAvoidNamespace "$cfgdir" || \
- $_SECURE_MOUNT --rbind -n "$vdir" "/"
+ $_SECURE_MOUNT --rbind -n -o dev "$vdir" "/"
}
function _umountVserverInternal
rc=$?
if test "$rc" -ne 0 -a "$rc" -ne 1; then
- $_VPS axf | $_EGREP -e "^[^ \t]+[ \t]+$S_CONTEXT[ \t]+" >&4
+ $_VPS axf | $_EGREP -e "^[ \t]*[^ \t]+[ \t]+$S_CONTEXT[ \t]+" >&4
killContext "$S_CONTEXT" 9
fi
done < /proc/mounts
# separate loop to avoid races while reading /proc/mounts
for i in "${list_umount[@]}"; do
- $_UMOUNT -l -n "$i"
+ $_UMOUNT -l -n -i "$i"
done
}
$_VDEVMAP --xid "$xid" "$op" "${vdevmap_opts[@]}" || return $?
done
}
+
+function hasCgroup
+{
+ $_GREP -q "cgroup" /proc/filesystems
+}
+
+function _generateCgroupOptions
+{
+ local file
+
+ hasCgroup || return 0
+
+ findFile file "$__CONFDIR/.defaults/cgroup/mnt" ""
+ if test -n "$file"; then
+ read CGROUP_MNT < "$file"
+ fi
+ findFile file "$__CONFDIR/.defaults/cgroup/subsys" ""
+ if test -n "$file"; then
+ read CGROUP_SUBSYS < "$file"
+ fi
+ findFile file "$__CONFDIR/.defaults/cgroup/inherit" ""
+ if test -n "$file"; then
+ _readFileToArray CGROUP_INHERIT "$file" ""
+ fi
+
+ return 0
+}
+
+function useCgroup
+{
+ hasCgroup || return 1
+ test -d "$CGROUP_MNT" || return 1
+ test -d "$1/cgroup" -o \
+ \( -d "$__CONFDIR/.defaults/cgroup" -a \
+ ! -e "$1/nocgroup" \)
+}
+
+function _handleCgroup
+{
+ local action="$1"
+ local vdir="$2"
+ local dir
+ local name
+ local i
+ local parent
+
+ useCgroup "$vdir" || return 0
+
+ findDir dir "$vdir/cgroup" "$__CONFDIR/.defaults/cgroup" ""
+ test -d "$dir" || return 0
+
+ if test -r "$dir"/name; then
+ read name < "$dir"/name
+ else
+ name="$VSERVER_NAME"
+ fi
+
+ if test "$action" = "attach"; then
+ if mkdir "$CGROUP_MNT/$name" 2>/dev/null; then
+ parent="$CGROUP_MNT/$name"
+ parent="${parent%/*}"
+ for i in "${CGROUP_INHERIT[@]}"; do
+ test -f "$parent/$i" || continue
+ cat "$parent/$i" > "$CGROUP_MNT/$name/$i"
+ done
+
+ shopt -s nullglob
+ for i in "$dir"/*; do
+ cat "$i" > "$CGROUP_MNT/$name/${i##*/}"
+ done
+ fi
+ echo "$$" > "$CGROUP_MNT/$name/tasks"
+ elif test "$action" = "destroy"; then
+ rmdir "$CGROUP_MNT/$name" 2>/dev/null || :
+ fi
+
+ return 0
+}
+
+function attachToCgroup
+{
+ _handleCgroup attach "$@"
+}
+
+function destroyCgroup
+{
+ _handleCgroup destroy "$@"
+}