dryang / rpms / systemd

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