X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Fupdate_oldconfig;h=6d4d87045063c802e693fbb7c3df7f3ee0b136e7;hp=e04e5fa6e02d125d9f9794ffb3a0187a0cf34d80;hb=0a714ba01bbcdb43fa2d07e88652be2b8fb1c52f;hpb=747f99c557dd88b7c16afe645fed9e15fde0cc44

diff --git a/build/update_oldconfig b/build/update_oldconfig
index e04e5fa..6d4d870 100755
--- a/build/update_oldconfig
+++ b/build/update_oldconfig
@@ -1,31 +1,74 @@
-#!/usr/bin/expect
+#!/usr/bin/expect -f
+
+#enables some diagnostic output
+exp_internal 1
+
+# log all interaction to a file to diagnose failures
+log_file -a [lindex $argv 0]
+
+# and not stddout
+log_user 0
 
-log_user 1
 set spawnid [spawn make oldconfig]
 
-match_max 200
+#match_max 200
 
 # need to allow for the config tool to be built initially
 set timeout 30
 
 expect {
     timeout {
-        puts "timeout"
+        puts "timeout in update_oldconfig waiting for a prompt we recognize"
         exit 1
     }
-    -re "\n  *(\[^\n]* \\\[N\/y\/\\?] \\(NEW\\)) " {
+    -re "\n *(\[^\n]* \\\[N\/y\/\\?] \\(NEW\\)) " {
          puts "$expect_out(1,string) n"
          send "n\r"
          exp_continue
     }
-    -re "\n  *(\[^\n]* \\\[N\/m\/y\/\\?] \\(NEW\\)) " {
+    -re "\n *(\[^\n]* \\\[N\/m\/y\/\\?] \\(NEW\\)) " {
+        puts "$expect_out(1,string) m"
+        send "m\r"
+        exp_continue
+    }
+    -re "\n *(\[^\n]* \\\[N\/y\/m\/\\?] \\(NEW\\)) " {
         puts "$expect_out(1,string) m"
         send "m\r"
         exp_continue
     }
-    -re "\n  *(\[^\n]* \\\[N\/m\/\\?] \\(NEW\\)) " {
+    -re "\n *(\[^\n]* \\\[N\/m\/\\?] \\(NEW\\)) " {
         puts "$expect_out(1,string) m"
         send "m\r"
         exp_continue
     }
+    -re "\n *(\[^\n]* \\\[Y\/n\/\\?] \\(NEW\\)) " {
+        puts "$expect_out(1,string) y"
+        send "y\r"
+        exp_continue
+    }
+    -re "\n *(\[^\n]* \\\[\[0-9]*] \\(NEW\\)) " {
+        puts "$expect_out(1,string) <cr>"
+        send "\r"
+        exp_continue
+    }
+    -re "\n *(\[^\n]* \\\[M\/n\/\\?] \\(NEW\\)) " {
+        puts "$expect_out(1,string) m"
+        send "m\r"
+        exp_continue
+    }
+    -re "\n *(\[^\n]* \\\[M\/n\/y\/\\?] \\(NEW\\)) " {
+        puts "$expect_out(1,string) m"
+        send "m\r"
+        exp_continue
+    }
+    -re "\n *(\[^\n]* \\\[Y\/n\/m\/\\?] \\(NEW\\)) " {
+        puts "$expect_out(1,string) m"
+        send "m\r"
+        exp_continue
+    }
+    -re "\n *(\[^\n]* \\\[Y\/\\?] \\(NEW\\)) " {
+        puts "$expect_out(1,string) y"
+        send "y\r"
+        exp_continue
+    }
 }