X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvserver;h=cbee3860107e9dbc0bac81a2d19afa1f4c082dab;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=c776201cc62df71755d2dfa0f5adfbf62e3aec94;hpb=5f917915b5648233b3e58488b56a718db3af397f;p=util-vserver.git

diff --git a/scripts/vserver b/scripts/vserver
index c776201..cbee386 100755
--- a/scripts/vserver
+++ b/scripts/vserver
@@ -1,5 +1,5 @@
 #! /bin/bash
-# $Id: vserver 2418 2006-12-08 13:28:02Z dhozac $
+# $Id: vserver 2566 2007-07-18 17:24:36Z dhozac $
 
 # Copyright (C) 2003,2004,2005 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
@@ -59,8 +59,8 @@ Possible commands are:
                 ... builds a new vserver from scratch
     delete      ... remove a vserver
 
-    unify [-R]
-		... (de)unify vserver
+    unify [-R] <vunify-opts>*
+		... (de)unify the vserver with its reference vserver(s).
 		
     pkg install <pkg>
 		... installs package(s) in the vserver
@@ -77,8 +77,8 @@ Possible commands are:
 		    while 'internalize' means that data and programs from the
 		    vserver will be used.
 
-    unify <vunify-opts>*
-                ... unify the vserver with its reference vserver(s).
+    hashify
+                ... hashify the guest.
 		    
 
 Please report bugs to $PACKAGE_BUGREPORT"
@@ -119,7 +119,7 @@ function msg()
 set +e
 
 OPTIONS_ORIG=( "$@" )
-tmp=$(getopt -o +sv --long nonamespace,--nonamespace,--insecure,defaulttty,help,debug,version,sync,verbose,silent -n "$0" -- "$@") || exit 1
+tmp=$(getopt -o +sv --long nonamespace,--nonamespace,--insecure,defaulttty,help,debug,strace,debug-sysv,version,sync,verbose,silent -n "$0" -- "$@") || exit 1
 eval set -- "$tmp"
 
 OPTION_FORCE_SYNC=
@@ -129,6 +129,8 @@ OPTION_DEBUG=
 OPTION_NONAMESPACE=
 OPTION_INSECURE=
 OPTION_DEFAULTTTY=
+OPTION_STRACE=
+OPTION_DEBUG_SYSV=
 
 while true; do
     case "$1" in
@@ -141,6 +143,8 @@ while true; do
 	(----nonamespace)OPTION_NONAMESPACE=$1;;
 	(--defaulttty)	OPTION_DEFAULTTTY=$1;;
 	(----insecure)	OPTION_INSECURE=1;;
+	(--strace)	OPTION_STRACE=1;;
+	(--debug-sysv*)	OPTION_DEBUG_SYSV=$1;;
 	(--)	   	shift; break;;
 	(*)	   	echo $"vserver: internal error; arg=='$1'" >&2; exit 1;;
     esac
@@ -173,6 +177,9 @@ if test -n "$allow_legacy"; then
     test -d "$VSERVER_DIR" -o ! -e "$__CONFDIR/$vserver.conf" || do_legacy=1
 
     test -z "$do_legacy" || {
+	if test "$cmd" = "convert"; then
+	    exec $__PKGLIBDIR/vserver.convert "$vserver"
+	fi
 	echo $"WARNING: can not find configuration, assuming legacy method" >&2
 	exec "$_VSERVER_LEGACY" "$@"
     }
@@ -190,11 +197,7 @@ Possible solutions:
     exit 5
 } >&2
 
-if test -e "$VSERVER_DIR"/name; then
-    read VSERVER_NAME <"$VSERVER_DIR"/name
-else
-    VSERVER_NAME=$(basename "$VSERVER_DIR")
-fi
+_setVserverName
 
 # Create a new namespace when starting the guest
 test "$2" != start -o -n "$OPTION_NONAMESPACE" || isAvoidNamespace "$VSERVER_DIR" || \
@@ -286,6 +289,10 @@ case "$2" in
 	    exit 3
 	fi
 	;;
+    (convert)
+	echo "Vserver '$vserver' is already converted"
+	exit 1
+	;;
     (*)
 	echo $"Usage: $0 <vserver> {start|stop|suexec|restart|condrestart|exec|enter|chkconfig|running|status|delete}" >&2
 	exit 2