Re-add wrongly removed ubuntu 20.04 (uyuni) #1238481

CHANGELOG.md

@@ -1,7 +1,7 @@
 - Added links to supported features tables for third party operating
   systems (bsc#1236810)
-- Removed Ubuntu 20.04 from the list supported clients in Client
-  Configuration Guide (bsc#1238481)
+- Removed Ubuntu 20.04 for SUSE Multi-Linux Manager from the list
+  supported clients in Client Configuration Guide (bsc#1238481)
 - Fixed procedure in Troubleshooting section about full disk event
   in the Administration Guide (bsc#1237535)
 - Renamed client tools channel to new product name SUSE Multi-Linux

modules/client-configuration/pages/clients-ubuntu.adoc

@@ -1,5 +1,5 @@
 [[clients-ubuntu]]
-= Registering {ubuntu} 22.04 and 24.04 Clients
+= Registering {ubuntu} Clients
 
 This section contains information about registering clients running {ubuntu} operating systems.
 
@@ -77,6 +77,21 @@ The channels you need for this procedure are:
 
 | {ubuntu} 24.04 | ubuntu-2404-pool-amd64-uyuni | ubuntu-2404-amd64-main-uyuni | ubuntu-2404-amd64-main-updates-uyuni | ubuntu-2404-amd64-main-security-uyuni | ubuntu-2404-amd64-uyuni-client
 | {ubuntu} 22.04 | ubuntu-2204-pool-amd64-uyuni | ubuntu-2204-amd64-main-uyuni | ubuntu-2204-amd64-main-updates-uyuni | ubuntu-2204-amd64-main-security-uyuni | ubuntu-2204-amd64-uyuni-client
+| {ubuntu} 20.04 | ubuntu-2004-pool-amd64-uyuni | ubuntu-2004-amd64-main-uyuni | ubuntu-2004-amd64-main-updates-uyuni | ubuntu-2004-amd64-main-security-uyuni | ubuntu-2004-amd64-uyuni-client
+|===
+
+Version 20.04 also requires the Universe channels:
+
+[[ubuntu-universe-channels-cli-uyuni]]
+[cols="1,1", options="header"]
+.Ubuntu 20.04 Universe Channels - CLI
+|===
+
+| {ubuntu} 20.04           | {nbsp}
+| Universe Channel         | ubuntu-2004-amd64-universe-uyuni
+| Universe Updates Channel | ubuntu-2004-amd64-universe-updates-uyuni
+| Universe Security Updates Channel | ubuntu-2004-amd64-universe-security-uyuni
+| Universe Backports Channel | ubuntu-2004-amd64-universe-backports-uyuni
 
 |===
 
@@ -160,8 +175,7 @@ Create the appropriate child channels below already synchronized {ubuntu} parent
 
 [IMPORTANT]
 ====
-The procedure shown here can be used to circumvent the subscription limitations - however, this constitutes a breach of the Terms of Service and may have **legal consequences**.
-There must always be sufficient subscriptions for the number of systems used.
+The procedure shown here can be used to circumvent the subscription limitations - however, this constitutes a breach of the Terms of Service and may have **legal consequences**. There must always be sufficient subscriptions for the number of systems used.
 ====
 
 == Check Synchronization Status

modules/client-configuration/pages/supported-features-ubuntu.adoc

@@ -201,173 +201,214 @@ endif::[]
 
 ifeval::[{uyuni-content} == true]
 
-[cols="1,1,1", options="header"]
+[cols="1,1,1,1", options="header"]
 .Supported Features on {ubuntu} Operating Systems
 |===
 
 | Feature
+| {ubuntu}{nbsp}20.04
 | {ubuntu}{nbsp}22.04
 | {ubuntu}{nbsp}24.04
 
 | Client
 | {check}
 | {check}
+| {check}
 
 | System packages
 | Canonical
 | Canonical
+| Canonical
 
 | Registration
 | {check}
 | {check}
+| {check}
 
 | Install packages
 | {check}
 | {check}
+| {check}
 
 | Apply patches
 | {check}
 | {check}
+| {check}
 
 | Remote commands
 | {check}
 | {check}
+| {check}
 
 | System package states
 | {check}
 | {check}
+| {check}
 
 | System custom states
 | {check}
 | {check}
+| {check}
 
 | Group custom states
 | {check}
 | {check}
+| {check}
 
 | Organization custom states
 | {check}
 | {check}
+| {check}
 
 | System set manager (SSM)
 | {check}
 | {check}
+| {check}
 
 | Product migration
 | N/A
 | N/A
+| N/A
 
 | Basic Virtual Guest Management {star}
 | {check}
 | {check}
+| {check}
 
 | Advanced Virtual Guest Management {star}
 | {check}
 | {check}
+| {check}
 
 | Virtual Guest Installation (Kickstart), as Host OS
 | {cross}
 | {cross}
+| {cross}
 
 | Virtual Guest Installation (image template), as Host OS
 | {check}
 | {check}
+| {check}
 
 | System deployment (PXE/Kickstart)
 | {cross}
 | {cross}
+| {cross}
 
 | System redeployment (Kickstart)
 | {cross}
 | {cross}
+| {cross}
 
 | Contact methods
 | {check} ZeroMQ, Salt-SSH
 | {check} ZeroMQ, Salt-SSH
+| {check} ZeroMQ, Salt-SSH
 
 | Works with {productname} Proxy
 | {check}
 | {check}
+| {check}
 
 | Action chains
 | {check}
 | {check}
+| {check}
 
 | Staging (pre-download of packages)
 | {check}
 | {check}
+| {check}
 
 | Duplicate package reporting
 | {check}
 | {check}
+| {check}
 
 | CVE auditing
 | {question}
 | {question}
+| {question}
 
 | SCAP auditing
 | {question}
 | {question}
+| {question}
 
 | Package verification
 | {cross}
 | {cross}
+| {cross}
 
 | Package locking
 | {check}
 | {check}
+| {check}
 
 | System locking
 | {cross}
 | {cross}
+| {cross}
 
 | System snapshot
 | {cross}
 | {cross}
+| {cross}
 
 | Configuration file management
 | {check}
 | {check}
+| {check}
 
 | Package profiles
 | {check} Profiles supported, Sync not supported
 | {check} Profiles supported, Sync not supported
+| {check} Profiles supported, Sync not supported
 
 | Power management
 | {check}
 | {check}
+| {check}
 
 | Monitoring
 | {check}
 | {check}
+| {check}
 
 | Docker buildhost
 | {question}
 | {question}
+| {question}
 
 | Build Docker image with OS
 | {check}
 | {check}
+| {check}
 
 | Kiwi buildhost
 | {cross}
 | {cross}
+| {cross}
 
 | Build Kiwi image with OS
 | {cross}
 | {cross}
+| {cross}
 
 | Recurring Actions
 | {check}
 | {check}
+| {check}
 
 | AppStreams
 | N/A
 | N/A
+| N/A
 
 | Yomi
 | N/A
 | N/A
+| N/A
 
 |===
 

modules/client-configuration/pages/supported-features.adoc

@@ -272,7 +272,7 @@ ifeval::[{uyuni-content} == true]
 | {check}
 | {cross}
 
-| {ubuntu} 24.04, 22.04 (*)
+| {ubuntu} 24.04, 22.04, 20.04 (*)
 | {check}
 | {cross}
 | {cross}