summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinier Schoof <reinier@skoef.nl>2015-09-29 20:41:47 +0200
committerReinier Schoof <reinier@skoef.nl>2015-09-29 20:41:47 +0200
commit3dd052e902e1e916aeecd91dd1d711fbbb4dc7f1 (patch)
treea83b231fb0ae64b7375b685d8055c7e4cffb9006
parentdbaa0aa77d4420f660262222cbcf99fa3e3cbf4e (diff)
parent3de4d6d3f8d477771b6a8835348177a0faee2379 (diff)
Merge remote-tracking branch 'ytti/master'
-rw-r--r--lib/oxidized/model/junos.rb2
-rw-r--r--lib/oxidized/model/xos.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/oxidized/model/junos.rb b/lib/oxidized/model/junos.rb
index e43d71a..0e921d2 100644
--- a/lib/oxidized/model/junos.rb
+++ b/lib/oxidized/model/junos.rb
@@ -9,7 +9,7 @@ class JunOS < Oxidized::Model
cmd :all do |cfg|
# we don't need screen-scraping in ssh due to exec
cfg = cfg.lines.to_a[1..-2].join if telnet
- cfg.lines.map { |line| line.rstrip }.join "\n"
+ cfg.lines.map { |line| line.rstrip }.join("\n") + "\n"
end
cmd :secret do |cfg|
diff --git a/lib/oxidized/model/xos.rb b/lib/oxidized/model/xos.rb
index e4a1ed4..de8ec39 100644
--- a/lib/oxidized/model/xos.rb
+++ b/lib/oxidized/model/xos.rb
@@ -37,6 +37,7 @@ class XOS < Oxidized::Model
cfg :telnet, :ssh do
post_login 'disable clipaging'
pre_logout 'exit'
+ pre_logout 'n'
end
end