Be more liberal about username prompt

^\r? was too strict

Also move non-config above of config, rancid-style.

Also Procurve is unbelievably shitty crapbox, screen drawing is shit,
telnet password is maximum 17 chars, ssh password maximum 16 chars, que?

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/oxidized/model/procurve.rb b/lib/oxidized/model/procurve.rb
index b431629..9654806 100644
--- a/lib/oxidized/model/procurve.rb
+++ b/lib/oxidized/model/procurve.rb
@@ -22,8 +22,6 @@ class Procurve < Oxidized::Model
     new_cfg
   end
 
-  cmd 'show running-config'
-
   cmd 'show version' do |cfg|
     comment cfg
   end
@@ -32,9 +30,11 @@ class Procurve < Oxidized::Model
     comment cfg
   end
 
+  cmd 'show running-config'
+
   cfg :telnet do
-    username /^\r?Username:/
-    password /Password: /
+    username /Username:/
+    password /Password:/
   end
 
   cfg :telnet, :ssh do