X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-copy;h=6489aa4a4bb4d2e608b50b079f1d426708a16f22;hb=02598b80efa142453f5d67be4ea95e3f35d63682;hp=c98cd48ac66277ce98936911e4cad5912e37a9fe;hpb=8be566b1a2c10b883a2ec9a003cdf568e476f070;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-copy b/util-vserver/scripts/vserver-copy index c98cd48..6489aa4 100755 --- a/util-vserver/scripts/vserver-copy +++ b/util-vserver/scripts/vserver-copy @@ -36,9 +36,9 @@ # used so that if/when you reboot the source roothost you don't have the # same vserver and IP address running on two machines. -: ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars} +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} test -e "$UTIL_VSERVER_VARS" || { - echo "Can not find util-vserver installation; aborting..." + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 exit 1 } . "$UTIL_VSERVER_VARS" @@ -99,7 +99,7 @@ flag a vserver can even be operationally moved to different hardware within seconds. The -i and -d flags can be used to minimally reconfigure the destination -vserver (rewrites /etc/vservers/newname.conf and $DEFAULT_VSERVERDIR/newname/etc/hosts) +vserver (rewrites /etc/vservers/newname.conf and $__DEFAULT_VSERVERDIR/newname/etc/hosts) Options: -h, --help this help @@ -143,7 +143,7 @@ rsh=(false) colon=":" domain="" ip="" -vsroot=$DEFAULT_VSERVERDIR +vsroot=$__DEFAULT_VSERVERDIR if [ $# -eq 0 ]; then # Script invoked with no command-line args? usage @@ -278,7 +278,7 @@ if [ -n "$ip" ] && \ fi # This works both locally and remote -if ($shcmd $dhost $SBINDIR/vserver $newname running | grep 'is running'); then +if ($shcmd $dhost $__SBINDIR/vserver $newname running | grep 'is running'); then warn "destination vserver \"$newname\" is running" error 1 "Cannot copy over a running vserver" fi @@ -290,7 +290,7 @@ info "Attempting to copy $vserver to $dhost$colon$newname" if $stopstart; then info "Stopping virtual server \"$vserver\" on localhost" - $SBINDIR/vserver $vserver stop + $__SBINDIR/vserver $vserver stop fi info "Syncing directories" @@ -365,8 +365,8 @@ fi if $stopstart; then info "Starting virtual server \"$vserver\" on $dhost" - $shcmd $dhost $SBINDIR/vserver $vserver start - if ($shcmd $dhost $SBINDIR/vserver $vserver running | \ + $shcmd $dhost $__SBINDIR/vserver $vserver start + if ($shcmd $dhost $__SBINDIR/vserver $vserver running | \ grep 'not running'); then error 1 "Virtual server \"$vserver\" failed to start on $dhost" fi