merge up to 2.4.12

diff --git a/common.config b/common.config
index 588114a2ff5117493f68816db78de482f4056d82..ef5a75f678e039cfbabbe9fe61431ceee5189494 100644 (file)
--- a/common.config
+++ b/common.config
@@ -135,8 +135,10 @@ in
        ;;
     lord)
        TEST_DIR=/xfs
        ;;
     lord)
        TEST_DIR=/xfs

-       TEST_DEV=/dev/sda4
-       SCRATCH_DEV=/dev/hda2
+       TEST_DEV=/dev/sda5
+       SCRATCH_DEV=/dev/sda6
+       SCRATCH_LOGDEV=/dev/hda7
+       SCRATCH_RTDEV=/dev/hda8

        SCRATCH_MNT=/xfs1
        ;;
     lumpy)
        SCRATCH_MNT=/xfs1
        ;;
     lumpy)