X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fupdate_oldconfig;h=6d4d87045063c802e693fbb7c3df7f3ee0b136e7;hb=98da9ee4d8d55b4bae40353930312d1475947f46;hp=8944617bd8b2cb7adddfd5ffb660ee9b11e7aa71;hpb=e726593675e7d958f199034245f0a055259655c5;p=fs%2Flustre-release.git

diff --git a/build/update_oldconfig b/build/update_oldconfig
index 8944617..6d4d870 100755
--- a/build/update_oldconfig
+++ b/build/update_oldconfig
@@ -1,6 +1,14 @@
-#!/usr/bin/expect -d
+#!/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
+
 set spawnid [spawn make oldconfig]
 
 #match_max 200
@@ -10,22 +18,57 @@ 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
+    }
 }