1ff636
From e31c6804ca177ab911f6212b34930969b83f2d30 Mon Sep 17 00:00:00 2001
1ff636
From: Stephen Gallagher <sgallagh@redhat.com>
1ff636
Date: Wed, 29 Apr 2015 08:19:05 -0400
1ff636
Subject: [PATCH] Add VARIANT as a standard value for /etc/os-release
1ff636
1ff636
Some distributions (such as Fedora) are using the VARIANT field to
1ff636
indicate to select packages which of several default configurations
1ff636
they should be using. For example, VARIANT=Server provides a
1ff636
different default firewall configuration (blocking basically
1ff636
everything but SSH and the management console) whereas
1ff636
VARIANT=Workstation opens many other ports for application
1ff636
compatibility.
1ff636
1ff636
By adding this patch to the manual pages, we can standardize on a
1ff636
cross-distribution mechanism for accomplishing this.
1ff636
1ff636
Fedora implementation details are available at
1ff636
https://fedoraproject.org/wiki/Packaging:Per-Product_Configuration
1ff636
1ff636
(David: drop double paranthesis)
1ff636
1ff636
(cherry picked from commit be7d0048ddda1e994f651e2825f96266d537d10d)
1ff636
1ff636
Cherry-picked from: be7d004
1ff636
Resolves: #1222517
1ff636
---
1ff636
 man/os-release.xml | 35 +++++++++++++++++++++++++++++++++++
1ff636
 1 file changed, 35 insertions(+)
1ff636
1ff636
diff --git a/man/os-release.xml b/man/os-release.xml
Pablo Greco 48fc63
index 4f57323d49..4ca2e59706 100644
1ff636
--- a/man/os-release.xml
1ff636
+++ b/man/os-release.xml
1ff636
@@ -273,6 +273,41 @@
1ff636
         </para></listitem>
1ff636
       </varlistentry>
1ff636
 
1ff636
+      <varlistentry>
1ff636
+        <term><varname>VARIANT=</varname></term>
1ff636
+
1ff636
+        <listitem><para>
1ff636
+        A string identifying a specific variant or edition of the
1ff636
+        operating system suitable for presentation to the user. This
1ff636
+        field may be used to inform the user that the configuration of
1ff636
+        this system is subject to a specific divergent set of rules or
1ff636
+        default configuration settings. This field is optional and may
1ff636
+        not be implemented on all systems.
1ff636
+        Examples:
1ff636
+        <literal>VARIANT="Server Edition"</literal>,
1ff636
+        <literal>VARIANT="Smart Refrigerator Edition"</literal>
1ff636
+        Note: this field is for display purposes only. The
1ff636
+        <varname>VARIANT_ID</varname> field should be used for making
1ff636
+        programmatic decisions.
1ff636
+        </para></listitem>
1ff636
+      </varlistentry>
1ff636
+
1ff636
+      <varlistentry>
1ff636
+        <term><varname>VARIANT_ID=</varname></term>
1ff636
+
1ff636
+        <listitem><para>
1ff636
+        A lower-case string (no spaces or other characters outside of
1ff636
+        0-9, a-z, ".", "_" and "-"), identifying a specific variant or
1ff636
+        edition of the operating system. This may be interpreted by
1ff636
+        other packages in order to determine a divergent default
1ff636
+        configuration. This field is optional and may not be
1ff636
+        implemented on all systems.
1ff636
+        Examples:
1ff636
+        <literal>VARIANT_ID=server</literal>,
1ff636
+        <literal>VARIANT_ID=embedded</literal>
1ff636
+        </para></listitem>
1ff636
+      </varlistentry>
1ff636
+
1ff636
     </variablelist>
1ff636
 
1ff636
     <para>If you are reading this file from C code or a shell script