From 7b09aa094c4ba51f6c5df6482077b40fe6ed3695 Mon Sep 17 00:00:00 2001 From: netdiver Date: Fri, 5 May 2023 10:55:06 +0200 Subject: [PATCH 1/2] Update firewareos.rb Changed regex for prompt to accept the dash character and match with the nodes of a fireware cluster. Fixes #2779 --- lib/oxidized/model/firewareos.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/oxidized/model/firewareos.rb b/lib/oxidized/model/firewareos.rb index f735454d8..c2a9e26c4 100644 --- a/lib/oxidized/model/firewareos.rb +++ b/lib/oxidized/model/firewareos.rb @@ -1,7 +1,7 @@ class FirewareOS < Oxidized::Model using Refinements - prompt /^\[?\w*\]?\w*?(<\w*>)?(#|>)\s*$/ + prompt /^\[?\w*\]?\w*?(<[\w-]*>)?(#|>)\s*$/ comment '-- ' cmd :all do |cfg| From ff09c2b8e6160e02d4b4eb8c5c24e8b1f926924c Mon Sep 17 00:00:00 2001 From: netdiver Date: Wed, 17 May 2023 12:39:28 +0200 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed052dfa3..d80f3f373 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ## Fixed - fixed empty lines for ZyXEL GS1900 switches (@jluebbe) +- fixed prompt for Watchguard FirewareOS not matching the regex when the node is non-master (@netdiver) ## [0.29.1 - 2023-04-24]