@@ -1125,7 +1125,8 @@ function service_check() {

     fi

     # Check if there is any falure flag file under $SERVICE_DIR/$SCREEN_NAME

-    failures=`ls "$SERVICE_DIR/$SCREEN_NAME"/*.failure 2>/dev/null`

+    # make this -o errexit safe

+    failures=`ls "$SERVICE_DIR/$SCREEN_NAME"/*.failure 2>/dev/null || /bin/true`

     for service in $failures; do

         service=`basename $service`

@@ -605,6 +605,9 @@ function err_trap {

     exit $r

 }

+

+set -o errexit

+

 # Print the commands being run so that we can see the command that triggers

 # an error.  It is also useful for following along as the install occurs.

 set -o xtrace