From 8cdad0c4b25482202b3b7745e1c61e00b7676147 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 28 Jan 2022 08:08:28 +0100
Subject: [PATCH] Ensure all facts have osfamily/operatingsystem facts

This partially fixes the issues seen in
https://github.com/voxpupuli/facterdb/pull/228/commits/cc06549fcc3f0c994968561adafa79423af65447
---
 facts/2.2/sles-15-x86_64.facts        | 1 +
 facts/2.3/sles-15-x86_64.facts        | 1 +
 facts/2.4/sles-15-x86_64.facts        | 1 +
 facts/2.5/sles-15-x86_64.facts        | 2 ++
 facts/3.0/ubuntu-15.10-i386.facts     | 2 ++
 facts/3.0/ubuntu-15.10-x86_64.facts   | 2 ++
 facts/3.10/ubuntu-18.04-aarch64.facts | 2 ++
 facts/3.2/aix-53-powerpc.facts        | 2 ++
 facts/3.2/aix-61-powerpc.facts        | 2 ++
 facts/3.2/aix-71-powerpc.facts        | 2 ++
 facts/3.6/pcs-6-x86_64.facts          | 2 ++
 facts/4.0/centos-7-x86_64.facts       | 2 ++
 facts/4.0/debian-10-x86_64.facts      | 2 ++
 facts/4.0/oraclelinux-7-x86_64.facts  | 2 ++
 facts/4.0/redhat-7-x86_64.facts       | 2 ++
 facts/4.0/scientific-7-x86_64.facts   | 2 ++
 facts/4.0/solaris-11-sun4v.facts      | 2 ++
 17 files changed, 31 insertions(+)

diff --git a/facts/2.2/sles-15-x86_64.facts b/facts/2.2/sles-15-x86_64.facts
index b1416d4a..c6627ae5 100644
--- a/facts/2.2/sles-15-x86_64.facts
+++ b/facts/2.2/sles-15-x86_64.facts
@@ -72,6 +72,7 @@
   "netmask_lo": "255.0.0.0",
   "mtu_lo": "65536",
   "id": "root",
+  "operatingsystem": "SLES",
   "os": {
     "family": "Linux",
     "release": {
diff --git a/facts/2.3/sles-15-x86_64.facts b/facts/2.3/sles-15-x86_64.facts
index 3959da45..b0c0c079 100644
--- a/facts/2.3/sles-15-x86_64.facts
+++ b/facts/2.3/sles-15-x86_64.facts
@@ -14,6 +14,7 @@
   "virtual": "kvm",
   "is_virtual": true,
   "hardwaremodel": "x86_64",
+  "operatingsystem": "SLES",
   "os": {
     "family": "Linux",
     "release": {
diff --git a/facts/2.4/sles-15-x86_64.facts b/facts/2.4/sles-15-x86_64.facts
index 2ab9dd5a..a540854b 100644
--- a/facts/2.4/sles-15-x86_64.facts
+++ b/facts/2.4/sles-15-x86_64.facts
@@ -74,6 +74,7 @@
   "netmask_lo": "255.0.0.0",
   "mtu_lo": 65536,
   "id": "root",
+  "operatingsystem": "SLES",
   "os": {
     "family": "Linux",
     "release": {
diff --git a/facts/2.5/sles-15-x86_64.facts b/facts/2.5/sles-15-x86_64.facts
index 4875364c..427ca7b0 100644
--- a/facts/2.5/sles-15-x86_64.facts
+++ b/facts/2.5/sles-15-x86_64.facts
@@ -14,6 +14,8 @@
   "virtual": "kvm",
   "is_virtual": true,
   "hardwaremodel": "x86_64",
+  "operatingsystem": "SLES",
+  "osfamily": "Suse",
   "os": {
     "family": "Linux",
     "release": {
diff --git a/facts/3.0/ubuntu-15.10-i386.facts b/facts/3.0/ubuntu-15.10-i386.facts
index eadd2df1..4f56f023 100644
--- a/facts/3.0/ubuntu-15.10-i386.facts
+++ b/facts/3.0/ubuntu-15.10-i386.facts
@@ -128,6 +128,8 @@
     "network": "10.0.2.0",
     "network6": "fe80::"
   },
+  "operatingsystem": "Ubuntu",
+  "osfamily": "Debian",
   "os": {
     "architecture": "i386",
     "distro": {
diff --git a/facts/3.0/ubuntu-15.10-x86_64.facts b/facts/3.0/ubuntu-15.10-x86_64.facts
index 3b50a287..2eb4d3fe 100644
--- a/facts/3.0/ubuntu-15.10-x86_64.facts
+++ b/facts/3.0/ubuntu-15.10-x86_64.facts
@@ -128,6 +128,8 @@
     "network": "10.0.2.0",
     "network6": "fe80::"
   },
+  "operatingsystem": "Ubuntu",
+  "osfamily": "Debian",
   "os": {
     "architecture": "amd64",
     "distro": {
diff --git a/facts/3.10/ubuntu-18.04-aarch64.facts b/facts/3.10/ubuntu-18.04-aarch64.facts
index 6a4729c6..93829b2f 100644
--- a/facts/3.10/ubuntu-18.04-aarch64.facts
+++ b/facts/3.10/ubuntu-18.04-aarch64.facts
@@ -467,6 +467,8 @@
     "network6": "fe80::",
     "primary": "eth0"
   },
+  "operatingsystem": "Ubuntu",
+  "osfamily": "Debian",
   "os": {
     "architecture": "aarch64",
     "distro": {
diff --git a/facts/3.2/aix-53-powerpc.facts b/facts/3.2/aix-53-powerpc.facts
index c106af2b..e451be2b 100644
--- a/facts/3.2/aix-53-powerpc.facts
+++ b/facts/3.2/aix-53-powerpc.facts
@@ -87,6 +87,8 @@
     "network": "10.32.77.0",
     "primary": "en0"
   },
+  "operatingsystem": "AIX",
+  "osfamily": "AIX",
   "os": {
     "architecture": "PowerPC_POWER7",
     "family": "AIX",
diff --git a/facts/3.2/aix-61-powerpc.facts b/facts/3.2/aix-61-powerpc.facts
index d943e7c8..613a608a 100644
--- a/facts/3.2/aix-61-powerpc.facts
+++ b/facts/3.2/aix-61-powerpc.facts
@@ -87,6 +87,8 @@
     "network": "10.32.77.0",
     "primary": "en0"
   },
+  "operatingsystem": "AIX",
+  "osfamily": "AIX",
   "os": {
     "architecture": "PowerPC_POWER7",
     "family": "AIX",
diff --git a/facts/3.2/aix-71-powerpc.facts b/facts/3.2/aix-71-powerpc.facts
index c9adc58b..54c80525 100644
--- a/facts/3.2/aix-71-powerpc.facts
+++ b/facts/3.2/aix-71-powerpc.facts
@@ -87,6 +87,8 @@
     "network": "10.32.77.0",
     "primary": "en0"
   },
+  "operatingsystem": "AIX",
+  "osfamily": "AIX",
   "os": {
     "architecture": "PowerPC_POWER7",
     "family": "AIX",
diff --git a/facts/3.6/pcs-6-x86_64.facts b/facts/3.6/pcs-6-x86_64.facts
index d6b505bf..0effab23 100644
--- a/facts/3.6/pcs-6-x86_64.facts
+++ b/facts/3.6/pcs-6-x86_64.facts
@@ -286,6 +286,8 @@
     "network6": "fec0::",
     "primary": "eth0"
   },
+  "operatingsystem": "RedHat",
+  "osfamily": "RedHat",
   "os": {
     "architecture": "x86_64",
     "family": "RedHat",
diff --git a/facts/4.0/centos-7-x86_64.facts b/facts/4.0/centos-7-x86_64.facts
index 2a31d51d..240bf116 100644
--- a/facts/4.0/centos-7-x86_64.facts
+++ b/facts/4.0/centos-7-x86_64.facts
@@ -1,5 +1,7 @@
 {
   "ipaddress": "192.168.0.1",
+  "operatingsystem": "CentOS",
+  "osfamily": "RedHat",
   "os": {
     "family": "RedHat",
     "name": "CentOS",
diff --git a/facts/4.0/debian-10-x86_64.facts b/facts/4.0/debian-10-x86_64.facts
index c80c81a6..593eef42 100644
--- a/facts/4.0/debian-10-x86_64.facts
+++ b/facts/4.0/debian-10-x86_64.facts
@@ -1,5 +1,7 @@
 {
   "ipaddress": "192.168.0.1",
+  "operatingsystem": "Debian",
+  "osfamily": "Debian",
   "os": {
     "architecture": "amd64",
     "release": {
diff --git a/facts/4.0/oraclelinux-7-x86_64.facts b/facts/4.0/oraclelinux-7-x86_64.facts
index 604511ae..57d8d9ea 100644
--- a/facts/4.0/oraclelinux-7-x86_64.facts
+++ b/facts/4.0/oraclelinux-7-x86_64.facts
@@ -1,5 +1,7 @@
 {
   "ipaddress": "192.168.0.1",
+  "operatingsystem": "OracleLinux",
+  "osfamily": "RedHat",
   "os": {
     "family": "RedHat",
     "name": "OracleLinux",
diff --git a/facts/4.0/redhat-7-x86_64.facts b/facts/4.0/redhat-7-x86_64.facts
index a3ed03b9..0b1fcf64 100644
--- a/facts/4.0/redhat-7-x86_64.facts
+++ b/facts/4.0/redhat-7-x86_64.facts
@@ -1,5 +1,7 @@
 {
   "ipaddress": "192.168.0.1",
+  "operatingsystem": "RedHat",
+  "osfamily": "RedHat",
   "os": {
     "family": "RedHat",
     "name": "RedHat",
diff --git a/facts/4.0/scientific-7-x86_64.facts b/facts/4.0/scientific-7-x86_64.facts
index a6fea558..237acac3 100644
--- a/facts/4.0/scientific-7-x86_64.facts
+++ b/facts/4.0/scientific-7-x86_64.facts
@@ -1,5 +1,7 @@
 {
   "ipaddress": "192.168.0.1",
+  "operatingsystem": "Scientific",
+  "osfamily": "RedHat",
   "os": {
     "family": "RedHat",
     "name": "Scientific",
diff --git a/facts/4.0/solaris-11-sun4v.facts b/facts/4.0/solaris-11-sun4v.facts
index 65b3272e..1c892468 100644
--- a/facts/4.0/solaris-11-sun4v.facts
+++ b/facts/4.0/solaris-11-sun4v.facts
@@ -22,6 +22,8 @@
   },
   "facterversion": "4.0.52",
   "timezone": "PST",
+  "operatingsystem": "Solaris",
+  "osfamily": "Solaris",
   "os": {
     "name": "Solaris",
     "hardware": "sun4v",