From 304249094a8f9ebe49ede713335108a00062942b Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Wed, 15 May 2024 17:36:23 -0400 Subject: [PATCH] And of course update the table --- README.md | 12 ++++++------ Rakefile | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 8c34924e..9fcbef96 100644 --- a/README.md +++ b/README.md @@ -100,22 +100,22 @@ FacterDB::get_facts('osfamily=Debian') | Scientific 7 | 1 | | 1 | | | | | | | Solaris 11 | 1 | | | | | | | | | Ubuntu 18.04 | 1 | 1 | 1 | 1 | 1 | 1 | | | -| Ubuntu 20.04 | 1 | 1 | 1 | 1 | 1 | 1 | | | +| Ubuntu 20.04 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | Ubuntu 21.04 | 1 | 1 | 1 | | | | | | | Ubuntu 21.10 | 1 | 1 | 1 | | | | | | | Ubuntu 22.04 | | | 1 | 1 | 1 | 1 | 1 | 1 | | Ubuntu 22.10 | | | 1 | | | | | | -| Windows 10 | | | 1 | 1 | 1 | | 1 | 1 | +| Windows 10 | | | 1 | 1 | 1 | 1 | 1 | 1 | +| Windows 11 | | | 1 | 1 | 1 | 1 | 1 | 1 | | Windows Server 2012 | | | 1 | 1 | 1 | | | | | Windows Server 2012 R2 | | | 1 | 1 | 1 | | | | | Windows Server 2016 | | | 1 | 1 | 1 | | | | | Windows Server 2016 Core | | | 1 | 1 | 1 | | | | -| Windows Server 2019 | | | 1 | 1 | 1 | | 1 | 1 | +| Windows Server 2019 | | | 1 | 1 | 1 | 1 | 1 | 1 | | Windows Server 2019 Core | | | 1 | 1 | 1 | | | | -| Windows Server 2022 | | | 1 | 1 | 1 | | 1 | 1 | +| Windows Server 2022 | | | 1 | 1 | 1 | 1 | 1 | 1 | | Windows Server 2022 Core | | | 1 | 1 | 1 | | | | -| openSUSE 15 | 1 | 1 | 1 | 1 | 1 | 1 | | | -| windows 11 | | | 1 | 1 | 1 | | 1 | 1 | +| openSUSE 15 | 1 | 1 | 1 | 1 | 1 | 1 | | 1 | Where the number (1, 2 etc.) are the number of factsets for that OS and facter combination (e.g., x86_64 and i386 architectures). diff --git a/Rakefile b/Rakefile index a8d471a6..a7b1acef 100644 --- a/Rakefile +++ b/Rakefile @@ -78,8 +78,8 @@ def factset_to_os_label(fs) db_filename = fs[:_facterdb_filename] || 'there_is_no_filename' label = if /windows-10-/.match?(db_filename) 'Windows 10' - elsif /windows-7-/.match?(db_filename) - 'Windows 7' + elsif /windows-11-/.match?(db_filename) + 'Windows 11' elsif /windows-8[\d.]*-/.match?(db_filename) "Windows #{os__rel.sub('6.2.9200', '8').sub('6.3.9600', '8.1')}" elsif /windows-.+-core-/.match?(db_filename)