Rebased and fixed conflicts

1 files changed, 2 insertions, 5 deletions

diff --git a/lib/oxidized/model/firewareos.rb b/lib/oxidized/model/firewareos.rb
index f456c60..bd0008d 100644
--- a/lib/oxidized/model/firewareos.rb
+++ b/lib/oxidized/model/firewareos.rb
@@ -1,6 +1,5 @@
 class FirewareOS < Oxidized::Model
-
-  prompt /^([\w.@-]+[#>]\s?)$/
+  prompt /^\[?\w*\]?\w*?(<\w*>)?(#|>)\s*$/
   comment  '-- '
 
   cmd :all do |cfg|
@@ -15,7 +14,7 @@ class FirewareOS < Oxidized::Model
 
   cmd 'show sysinfo' do |cfg|
     # avoid commits due to uptime
-    cfg = cfg.each_line.select { |line| not line.match /(.*time.*)|(.*memory.*)|(.*cpu.*)/ }
+    cfg = cfg.each_line.reject { |line| line.match /(.*time.*)|(.*memory.*)|(.*cpu.*)/ }
     cfg = cfg.join
     comment cfg
   end
@@ -25,6 +24,4 @@ class FirewareOS < Oxidized::Model
   cfg :ssh do
     pre_logout 'exit'
   end
-
 end
-