back out 2.4.x-xfs:slinx:84968a and redo change

Undoes mod:     2.4.x-xfs:slinx:84968a

diff --git a/tools/README.auto-qa b/tools/README.auto-qa
index 9fc03517dae5921aecd3d1356e107ea97b306f03..4a3e4531ada04b55b110834991775058739622cf 100644 (file)
--- a/tools/README.auto-qa
+++ b/tools/README.auto-qa
@@ -14,7 +14,7 @@ ______________________                                      ______________
                (auto-qa must be a link into it's own source tree
                so it can update itself)
        - copy an appropriate .config file to
                (auto-qa must be a link into it's own source tree
                so it can update itself)
        - copy an appropriate .config file to

-               $HOME/qa/$HOSTNAME-2.4-xfs-qa.config
+               $HOME/qa/$HOSTNAME.config

        - You'll need a hacked version of 'su' in $HOME/qa that
                 lets your user su to root/root without a password
                 (if you want to run from cron, it mustn't require
        - You'll need a hacked version of 'su' in $HOME/qa that
                 lets your user su to root/root without a password
                 (if you want to run from cron, it mustn't require


@@ -24,7 +24,7 @@ ______________________                                      ______________
        - chmod 6755 $HOME/qa/su
        - add the soon to be kernel to /etc/lilo.conf
 
        - chmod 6755 $HOME/qa/su
        - add the soon to be kernel to /etc/lilo.conf
 

-               image=/boot/vmlinuz-2.4-xfs-qa
+               image=/boot/vmlinuz-2.4.0-xfs-qa

                        label=linux-xfs-qa
                        append = "console=ttyS0,38400n8"
                
                        label=linux-xfs-qa
                        append = "console=ttyS0,38400n8"
                

diff --git a/tools/auto-qa b/tools/auto-qa
index 64c167ed7c90c6f61f9ee0647259a71cab089c62..09b2fec4e5592a5adf99fd056abac8f2cfd61be7 100755 (executable)
--- a/tools/auto-qa
+++ b/tools/auto-qa
@@ -65,7 +65,7 @@ _fail()
 # configuration (you could tune this)
 
 EXTRA="-xfs-qa"
 # configuration (you could tune this)
 
 EXTRA="-xfs-qa"

-VERSION="2.4"
+VERSION="2.4.1"

 BOOT="/boot"
 SOAK_PASSES="-1"
 SOAK_STRESS="10000"
 BOOT="/boot"
 SOAK_PASSES="-1"
 SOAK_STRESS="10000"


@@ -88,7 +88,7 @@ QADIR="$WORKAREA/cmd/xfstests"
 SUDO="su -c"
 IMAGE="$BOOT/vmlinuz-$VERSION$EXTRA"
 SYSTEMMAP="$BOOT/System.map-$VERSION$EXTRA"
 SUDO="su -c"
 IMAGE="$BOOT/vmlinuz-$VERSION$EXTRA"
 SYSTEMMAP="$BOOT/System.map-$VERSION$EXTRA"

-CONFIG="$ROOT/$HOST-$VERSION$EXTRA.config"
+CONFIG="$ROOT/$HOST.config"

 MODULES="/lib/modules/$VERSION$EXTRA"
 COMMON_CONFIG="$WORKAREA/cmd/xfstests/common.config"
 SH="/bin/sh"
 MODULES="/lib/modules/$VERSION$EXTRA"
 COMMON_CONFIG="$WORKAREA/cmd/xfstests/common.config"
 SH="/bin/sh"