Changeset 2664
- Timestamp:
- 01/20/08 08:56:23 (10 months ago)
- Files:
-
- trunk/doc/configuration.xml (modified) (1 diff)
- trunk/scripts/vserver.functions (modified) (4 diffs)
- trunk/scripts/vserver.start (modified) (1 diff)
- trunk/scripts/vserver.stop (modified) (1 diff)
- trunk/scripts/vserver.suexec (modified) (1 diff)
- trunk/src/vspace.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/doc/configuration.xml
r2624 r2664 1553 1553 </collection> 1554 1554 </collection> 1555 1556 <collection name="spaces" since="0.30.215"> 1557 <boolean name="pid"> 1558 <description>Enables pid virtualization for this guest</description> 1559 </boolean> 1560 <boolean name="net"> 1561 <description>Enable network virtualization for this guest</description> 1562 </boolean> 1563 <scalar name="mask"> 1564 <description>Contains a mask of spaces to clone/enter</description> 1565 </collection> 1555 1566 </collection> 1556 1567 </database> trunk/scripts/vserver.functions
r2656 r2664 47 47 declare -a OPTS_VTAG_ENTER=() 48 48 declare -a OPTS_VMEMCTRL=() 49 declare -a OPTS_VSPACE=() 49 50 50 51 declare -a STOPCMD_PREPARE=() … … 693 694 function _generateMemctrlOptions 694 695 { 695 local vdir="$ "696 local vdir="$1" 696 697 local badness 697 698 … … 700 701 701 702 OPTS_VMEMCTRL=( --badness "$badness" ) 703 } 704 705 function _generateSpaceOptions 706 { 707 local vdir="$1" 708 local d="$vdir"/spaces 709 710 test ! -e "$d"/pid || \ 711 OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --pid ) 712 713 test ! -e "$d"/net || { 714 OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --net ) 715 # network context and namespace don't make much sense 716 _HAVE_CHBIND_OPTIONS=1 717 CHBIND_CMD=() 718 } 719 720 local mask 721 getFileValue mask "$d"/mask || \ 722 OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --mask "$mask" ) 702 723 } 703 724 … … 747 768 _generateTagOptions "$1" 748 769 _generateMemctrlOptions "$1" 770 _generateSpaceOptions "$1" 749 771 750 772 if test -n "$_IS_FAKEINIT"; then trunk/scripts/vserver.start
r2626 r2664 138 138 $_EXEC_ULIMIT "$VSERVER_DIR"/ulimits \ 139 139 $_VTAG --create "${OPTS_VTAG_CREATE[@]}" --silent -- \ 140 $_VSPACE --new "${OPTS_VSPACE[@]}" -- \ 140 141 $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ 141 142 ${OPTION_STRACE:+$_STRACE -fF -o /tmp/vserver-start.$$} \ 142 143 ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ 144 $_VSPACE --set "${OPTS_VSPACE[@]}" -- \ 143 145 $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \ 144 146 $_VSCHED --xid self --force "${OPTS_VSCHED[@]}" -- \ trunk/scripts/vserver.stop
r2628 r2664 81 81 "${NICE_CMD[@]}" \ 82 82 "${CHBIND_CMD[@]}" \ 83 "$_VSPACE" --enter --xid "$S_CONTEXT" "${OPTS_VSPACE[@]}" -- \ 83 84 "$_VTAG" --migrate "${OPTS_VTAG_ENTER[@]}" --silent -- \ 84 85 $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" -- \ trunk/scripts/vserver.suexec
r2599 r2664 39 39 $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ 40 40 ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ 41 $_VSPACE --enter --xid "$S_CONTEXT" "${OPTS_VSPACE[@]}" -- \ 41 42 $_VTAG --migrate "${OPTS_VTAG_ENTER[@]}" --silent -- \ 42 43 $_VCONTEXT $SILENT_OPT --migrate --chroot \ trunk/src/vspace.c
r2659 r2664 111 111 pid_t pid; 112 112 113 /* optimize default case */ 114 if (mask == 0) 115 return; 116 113 117 signal(SIGCHLD, SIG_DFL); 114 118
