[Swift-commit] r5333 - branches/release-0.93/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2011-12-02 11:40:32 -0600 (Fri, 02 Dec 2011)
New Revision: 5333

Removed:
   branches/release-0.93/bin/vm/
Modified:
   branches/release-0.93/bin/start-coaster-service
Log:


Modified: branches/release-0.93/bin/start-coaster-service
===================================================================
--- branches/release-0.93/bin/start-coaster-service	2011-12-02 17:03:52 UTC (rev 5332)
+++ branches/release-0.93/bin/start-coaster-service	2011-12-02 17:40:32 UTC (rev 5333)
@@ -14,11 +14,8 @@
    PORT=$1
    EXECUTION_URL=http://localhost:$PORT
 
-   if [ ! -d "$SWIFTVMBOOT_DIR" ]; then
-      SWIFTVMBOOT_DIR=$SWIFT_BIN/vm/futuregrid
-      if [ ! -d "$SWIFTVMBOOT_DIR" ] || [ ! -x "$SWIFTVMBOOT_DIR/bin/bootit.sh" ]; then
-         crash "SWIFTVMBOOT_DIR incorrectly defined in coaster-service.conf"
-      fi
+   if [ ! -d "$SWIFTVMBOOT_DIR" ] || [ ! -x "$SWIFTVMBOOT_DIR/bin/bootit.sh" ]; then
+      crash "SWIFTVMBOOT_DIR incorrectly defined in coaster-service.conf"
    fi
 
    echo Starting virtual machines.. please wait
@@ -57,11 +54,8 @@
    PORT=$1
    EXECUTION_URL=http://localhost:$PORT
    
-   if [ ! -d "$SWIFTVMBOOT_DIR" ]; then
-      SWIFTVMBOOT_DIR=$SWIFT_BIN/vm/ec2
-      if [ ! -d "$SWIFTVMBOOT_DIR" ] || [ ! -x "$SWIFTVMBOOT_DIR/bin/gp-instance-create" ]; then
-         crash "SWIFTVMBOT_DIR incorrectly defined in coaster-service.conf"
-      fi
+   if [ ! -d "$SWIFTVMBOOT_DIR" ] || [ ! -x "$SWIFTVMBOOT_DIR/bin/gp-instance-create" ]; then
+      crash "SWIFTVMBOT_DIR incorrectly defined in coaster-service.conf"
    fi
 
    SEDFILE=`mktemp`