X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.start;h=1c65eb8bbc27b2d5e5ec27ac2c21dd524810d231;hb=b77c645592b1a03f017edc230c31b51c63c73f71;hp=8553bdd668b77bf4cf9b43f34c4ffcb388455195;hpb=fade0f093841d1bd8c2db68732527b64b42caba3;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index 8553bdd..1c65eb8 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -15,18 +15,19 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -lock "$LOCKDIR"/vserver."$(echo "$VSERVER_DIR" | tr -dc a-zA-Z0-9)".startup + +lock "$LOCKDIR"/vserver."$($_VSERVER_INFO "$VSERVER_DIR" CANONIFY)".startup if isVserverRunning "$VSERVER_DIR"; then - echo $"vserver '$VSERVER_NAME' already running; aborting..." >&2 - exit 1 + warning $"vserver '$VSERVER_NAME' already running" + exit 0 fi function cleanup() { set +e - test -z "$startsync_pipe" || rm -f "$startsync_pipe" + test -z "$startsync_pipe" || $_RM -f "$startsync_pipe" test -z "$is_started" || { unlock; return 0; } if test "$is_configured" -a -z "$is_executed"; then @@ -74,8 +75,9 @@ startsync_pipe= set -e trap "cleanup" EXIT -vshelper.doSanityCheck +sanityCheck "$VSERVER_DIR" +mountRootFS "$VSERVER_DIR" generateOptions "$VSERVER_DIR" execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" prepre-start enableInterfaces "$VSERVER_DIR" && have_interfaces=1 @@ -108,9 +110,9 @@ if $_VSERVER_INFO - FEATURE migrate; then "${INITCMD_START[@]}" else if test "$_IS_FAKEINIT"; then - startsync_pipe=$(mktemp /tmp/vserver-start.XXXXXX) - rm -f "$startsync_pipe" - mkfifo -m600 "$startsync_pipe" ## safe, since mkfifo does not follow symlinks + startsync_pipe=$($_MKTEMP /tmp/vserver-start.XXXXXX) + $_RM -f "$startsync_pipe" + $_MKFIFO -m600 "$startsync_pipe" ## safe, since mkfifo does not follow symlinks fi ${NICE_CMD[@]} \