From 7d3ca93cce474f415af7b3b836c5c9d105cd7659 Mon Sep 17 00:00:00 2001 From: Jesse Hathaway Date: Fri, 16 Apr 2021 20:52:49 +0000 Subject: [PATCH] [FACT-3023] xen command: avoid xen-toolstack warning xen-toolstack is deprecated and so on Puppet runs in Debian buster you receive this nettlesome message: warning: something called deprecated script /usr/lib/xen-common/bin/xen-toolstack Prior to this change we used xen-toolstack if it is present, but that is only necessary if more than one stack is installed. Instead check if we have multiple tool stacks and if we do use xen-toolstack if it is present. --- lib/facter/resolvers/xen.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/facter/resolvers/xen.rb b/lib/facter/resolvers/xen.rb index d008ff249f..738376881a 100644 --- a/lib/facter/resolvers/xen.rb +++ b/lib/facter/resolvers/xen.rb @@ -56,7 +56,12 @@ def detect_domains end def find_command - return XEN_TOOLSTACK if File.exist?(XEN_TOOLSTACK) + num_stacks = 0 + XEN_COMMANDS.each do |command| + num_stacks += 1 if File.exist?(command) + end + + return XEN_TOOLSTACK if num_stacks > 1 && File.exist?(XEN_TOOLSTACK) XEN_COMMANDS.each { |command| return command if File.exist?(command) } end