change inferno, sheila and chapter11 configs to follow same test partition conventions
authorDavid Disseldorp <ddiss@sgi.com>
Wed, 17 Jan 2007 15:00:07 +0000 (15:00 +0000)
committerDavid Disseldorp <ddiss@sgi.com>
Wed, 17 Jan 2007 15:00:07 +0000 (15:00 +0000)
Merge of master-melb:xfs-cmds:27957a by kenmcd.

common.config

index 50602c2c2cbabbd54c2e0e2cbc6dc8851c15d616..061185c1fa1ead40caaf643230fbe24ef04c01bc 100644 (file)
@@ -152,13 +152,14 @@ known_hosts()
            sheila)
                #dedicated qa machine (has some values already set)
                [ -z "$MODULAR" ] && MODULAR=1
-               EMAIL="nathans@larry"
-               [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-               [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/hdb1
+               EMAIL="ddiss@sgi.com"
                [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-               [ -z "$TEST_DEV" ] && TEST_DEV=/dev/hdb2
+               [ -z "$TEST_DEV" ] && TEST_DEV=/dev/hdb1
                [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/hdb3
-               [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/hdb5
+               [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
+               [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/hdb2
+               [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/hdb4
+               [ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb5
                ;;
             break)
                MODULAR=1
@@ -369,14 +370,14 @@ known_hosts()
            inferno)
                #dedicated qa machine (has some values already set)
                [ -z "$MODULAR" ] && MODULAR=1
-               EMAIL="ajones@sgi.com"
+               EMAIL="ddiss@sgi.com"
                [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
                [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
-               [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/ram0
+               [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
                [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
                [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
-               [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/ram1
-               #[ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb5
+               [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
+               [ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb5
                [ -z "$TAPE_DEV" ] && TAPE_DEV=/dev/st0
                ;;
            hellfire)
@@ -508,9 +509,12 @@ known_hosts()
                 [ -z "$MODULAR" ] && MODULAR=1
                 EMAIL="ddiss@sgi.com"
                 [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-                [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb6
+                [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb5
+               [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb7
                 [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-                [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb7
+                [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb6
+                [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb8
+               [ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb9
                 ;;
              dassi)
                 MODULAR=0