Changeset 2566
- Timestamp:
- 07/18/07 19:24:36 (1 year ago)
- Files:
-
- trunk/scripts/vserver (modified) (3 diffs)
- trunk/scripts/vserver.functions (modified) (1 diff)
- trunk/scripts/vserver.start (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/scripts/vserver
r2521 r2566 120 120 121 121 OPTIONS_ORIG=( "$@" ) 122 tmp=$(getopt -o +sv --long nonamespace,--nonamespace,--insecure,defaulttty,help,debug, version,sync,verbose,silent -n "$0" -- "$@") || exit 1122 tmp=$(getopt -o +sv --long nonamespace,--nonamespace,--insecure,defaulttty,help,debug,strace,debug-sysv,version,sync,verbose,silent -n "$0" -- "$@") || exit 1 123 123 eval set -- "$tmp" 124 124 … … 130 130 OPTION_INSECURE= 131 131 OPTION_DEFAULTTTY= 132 OPTION_STRACE= 133 OPTION_DEBUG_SYSV= 132 134 133 135 while true; do … … 142 144 (--defaulttty) OPTION_DEFAULTTTY=$1;; 143 145 (----insecure) OPTION_INSECURE=1;; 146 (--strace) OPTION_STRACE=1;; 147 (--debug-sysv*) OPTION_DEBUG_SYSV=$1;; 144 148 (--) shift; break;; 145 149 (*) echo $"vserver: internal error; arg=='$1'" >&2; exit 1;; trunk/scripts/vserver.functions
r2548 r2566 280 280 INITCMD_PREPARE=( $_FAKE_RUNLEVEL "$RUNLEVEL_START" /var/run/utmp ) 281 281 OPTS_ENV=( "${OPTS_ENV[@]}" PREVLEVEL=N RUNLEVEL="$RUNLEVEL_START" ) 282 if test -n "$OPTION_DEBUG_SYSV"; then 283 INITCMD_START=( /bin/bash -x "${INITCMD_START[@]}" ) 284 INITCMD_STOP=( /bin/bash -x "${INITCMD_STOP[@]}" ) 285 fi 282 286 ;; 283 287 trunk/scripts/vserver.start
r2466 r2566 134 134 $_EXEC_ULIMIT "$VSERVER_DIR"/ulimits \ 135 135 $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ 136 ${OPTION_STRACE:+$_STRACE -fF -o /tmp/vserver-start.$$} \ 136 137 ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ 137 138 $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \
