this seems to improve the non-rebooting situation
[xfstests-dev.git] / tools / auto-qa
index 64c167ed7c90c6f61f9ee0647259a71cab089c62..a4e07c5211c6b57ea522e20c68490d8b96f52803 100755 (executable)
@@ -65,7 +65,7 @@ _fail()
 # configuration (you could tune this)
 
 EXTRA="-xfs-qa"
-VERSION="2.4"
+VERSION="2.4.1"
 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"
-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"
@@ -192,7 +192,7 @@ _sudo()
 
 _restart()
 {
-    exec $ROOT/su -c "shutdown -r 2 \"auto-qa rebooting\" &" < /dev/null
+    exec $ROOT/su -c "(shutdown -r 2 \"auto-qa rebooting\" ; reboot )&" < /dev/null
 }
 
 _update_autoqa_file()