small common.config cleanup

Don't list various non-mandatory options near the check for the
mandatory ones, and make the test for the mandatory ones a proper if
statements.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/common.config b/common.config
index f8f8862d815330b215f7207217948f0e88059ee4..15c7976e6958b9f4632b0d31c426f4b49075f810 100644 (file)
--- a/common.config
+++ b/common.config
@@ -191,27 +191,18 @@ known_hosts()
   [ -f $HOST_CONFIG_DIR/$HOST ]        && . $HOST_CONFIG_DIR/$HOST
   [ -f $HOST_CONFIG_DIR/$HOST.config ] && . $HOST_CONFIG_DIR/$HOST.config
 
+  #  Mandatory Config values.
   MC=""
-#  Non-Mandatory Config values.
-#  [ -z "$MODULAR" ]        && MC="$MC MODULAR"
-#  [ -z "$TEST_LOGDEV" ]    && MC="$MC TEST_LOGDEV"
-#  [ -z "$SCRATCH_LOGDEV" ] && MC="$MC SCRATCH_LOGDEV"
-#  [ -z "$SCRATCH_RTDEV" ]  && MC="$MC SCRATCH_RTDEV"
-#  [ -z "$SCRATCH_MNT" ]    && MC="$MC SCRATCH_MNT"
-#  [ -z "$SCRATCH_DEV" ]    && MC="$MC SCRATCH_DEV"
-
   [ -z "$EMAIL" ]          && MC="$MC EMAIL"
   [ -z "$TEST_DIR" ]       && MC="$MC TEST_DIR"
   [ -z "$TEST_DEV" ]       && MC="$MC TEST_DEV"
 
-  [ "$MC" ] && (echo "Warning: need to define parameters for host $HOST";\
-               echo "       or set variables:"; \
-               echo "       $MC")
-#  if [ -e configs/$HOST.config ]
-#     then echo "Not carring, we have a configfile ($HOST_CONFIG_DIR/$HOST)"
-#  else
-     [ "$MC" ] &&  exit 1
-#  fi
+  if [ -n "$MC" ]; then
+    echo "Warning: need to define parameters for host $HOST"
+    echo "       or set variables:"
+    echo "       $MC"
+    exit 1
+  fi
 }
 
 if [ -f "$HOST_OPTIONS" ]; then