X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=e41334c0af1d51a01b4a28cbfe9f2355f7a5bc50;hb=aef33b9810242b2a769ad29facc1678f30c0d235;hp=59846ab84828477dc4bdc5cbe1bcd651b2c8fbbc;hpb=e4615ec7e88fbf35ad843fb52189e0486053b66e;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index 59846ab..e41334c 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -49,6 +49,8 @@ declare -a OPTS_VTAG_CREATE=() declare -a OPTS_VTAG_ENTER=() declare -a OPTS_VMEMCTRL=() declare -a OPTS_VSPACE=( --default ) +declare -a OPTS_VSPACE_SHARED=() +declare -a VSPACE_SHARED_CMD=() declare -a STOPCMD_PREPARE=() @@ -344,7 +346,8 @@ function _generateInitOptions panic "init-vserver.sh not found; aborting" fi - INITCMD_START=( env TERM=$TERM $RC_WRAP "$RUNLEVEL_START" ) + OPTS_ENV=( "${OPTS_ENV[@]}" TERM=$TERM ) + INITCMD_START=( $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 ) ;; @@ -786,16 +789,30 @@ function _generateSpaceOptions { local vdir="$1" local d="$vdir"/spaces + local shared - ( test ! -e "$d"/pid ) || \ - OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --pid ) + if test -e "$d"/pid; then + getFileValue shared "$d"/pid + if test -z "$shared"; then + OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --pid ) + else + OPTS_VSPACE_SHARED=( "${OPTS_VSPACE_SHARED[@]}" --pid ) + VSPACE_SHARED_CMD=( "${VSPACE_SHARED_CMD[@]}" $_VSPACE --enter --xid "$shared" --pid -- ) + fi + fi - test ! -e "$d"/net || { - OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --net ) + if test -e "$d"/net; then + getFileValue shared "$d"/net # network context and namespace don't make much sense _HAVE_CHBIND_OPTIONS=1 CHBIND_CMD=() - } + if test -z "$shared"; then + OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --net ) + else + OPTS_VSPACE_SHARED=( "${OPTS_VSPACE_SHARED[@]}" --net ) + VSPACE_SHARED_CMD=( "${VSPACE_SHARED_CMD[@]}" $_VSPACE --enter --xid "$shared" --net -- ) + fi + fi local mask getFileValue mask "$d"/mask || \ @@ -808,8 +825,8 @@ function prepareInit pushd "$1/vdir" >/dev/null case "$INITSTYLE" in sysv) - { find var/run ! -type d -print0; \ - find var/lock ! -type d -print0; } | xargs -0r $_CHROOT_SH rm + { $_FIND var/run ! -type d -print0; \ + $_FIND var/lock ! -type d -print0; } | xargs -0r $_CHROOT_SH rm ;; plain) $_CHROOT_SH rm .autofsck forcefsck 2>/dev/null || : @@ -1217,7 +1234,7 @@ WARNING: There is no cachedirectory configured for this vserver; ln -s ../.defaults/cachebase/$VSERVER_NAME $cfgdir/cache " - find "$cfgdir" -type f -exec "$_CHECK_UNIXFILE" '{}' ';' + $_FIND "$cfgdir" -type f -exec "$_CHECK_UNIXFILE" '{}' ';' vshelper.doSanityCheck @@ -1382,7 +1399,8 @@ function _namespaceCleanup while read -r dev path opts; do test -n "$path" || continue for i in "$root" /dev /proc; do - test "${path#$i}" != "$path" && continue 2 + path_dir="${path}/" + test "${path_dir#${i}/}" != "${path_dir}" && continue 2 done for i in "${list[@]}" /; do test "$path" = "$i" && continue 2 @@ -1442,6 +1460,10 @@ function _generateCgroupOptions findFile file "$__CONFDIR/.defaults/cgroup/subsys" "" if test -n "$file"; then read CGROUP_SUBSYS < "$file" + elif $_GREP -q '^ns[[:space:]]' /proc/cgroups; then + # Hack for the ns subsystem, with which we are incompatible + CGROUP_SUBSYS=$($_SED '/^#/d;/^ns[[:space:]]/d;s/[[:space:]].*//' /proc/cgroups | \ + (s=""; while read x; do test -n "$s" && s="$s,"; s="$s$x"; done; echo "$s")) fi findFile file "$__CONFDIR/.defaults/cgroup/inherit" "" if test -n "$file"; then