Modify know hosts (kermit1, gonzo1).

Merge of master-melb:xfs-cmds:29523a by kenmcd.

  Modify know hosts (kermit1, gonzo1).

diff --git a/common.config b/common.config
index 27bc8da1b51b1024d4c7d95508cb3093c26e5faf..d7c8723c17cd35490df19db80b9d475649524391 100644 (file)
--- a/common.config
+++ b/common.config
@@ -345,31 +345,26 @@ known_hosts()
             SCRATCH_DEV=/dev/sdd4
             #SCRATCH_LOGDEV=/dev/sdd2
             ;;
-        cxfsaltix5)
+        gonzo1)
             EMAIL="leenap@sgi.com"
-            TEST_DIR=/mnt/xfsnew
-            TEST_DEV=/dev/lxvm/xfsnew
-            SCRATCH_MNT=/mnt/xfsscratch
-            SCRATCH_DEV=/dev/lxvm/xfsscratch
-            ;;
+            [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/xfs_test
+            [ -z "$TEST_DEV" ] && TEST_DEV=/dev/lxvm/xfs_test
+            [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb1
+            [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/xfs_scratch
+            [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/lxvm/xfs_scratch
+            [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb2
+            [ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb3
+           ;;
         kermit1)
             EMAIL="mohamedb@sgi.com"
-            #EMAIL="leenap@sgi.com"
-            #TEST_DIR=/mnt/xfs_test
-            #TEST_DEV=/dev/lxvm/xfs_test
-            #TEST_DIR=/mnt/xfsdata
-            #TEST_DEV=/dev/cxvm/xfsdata
-            #TEST_LOGDEV=/dev/sdd1
-            #SCRATCH_MNT=/mnt/xfs_scratch
-            #SCRATCH_DEV=/dev/lxvm/xfs_scratch
-            #SCRATCH_MNT=/mnt/xfsscratch
-            #SCRATCH_DEV=/dev/cxvm/xfsscratch
-            #SCRATCH_LOGDEV=/dev/sdd2
-            TEST_DIR=/mnt/test
-            TEST_DEV=/dev/lxvm/test
-            SCRATCH_MNT=/mnt/scratch
-            SCRATCH_DEV=/dev/lxvm/scratch
-            ;;
+            [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/xfs_test
+            [ -z "$TEST_DEV" ] && TEST_DEV=/dev/lxvm/xfs_test
+            [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb1
+            [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/xfs_scratch
+            [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/lxvm/xfs_scratch
+            [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb2
+            [ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb3
+           ;;
         rizzo1)
             EMAIL="mohamedb@sgi.com"
             TEST_DIR=/mnt/xfs_data