X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fos-release.xml;h=4e02f800b63d19cc9c754eb5c35df7a258796596;hb=5e34b37c9fec5da130f6549ddabd8a2af5c9faac;hp=c1dd62f7156d2c1c978eab7229d522d0681cf565;hpb=79640424059328268b9fb6c5fa8eb777b27a177e;p=elogind.git
diff --git a/man/os-release.xml b/man/os-release.xml
index c1dd62f71..4e02f800b 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -49,13 +49,15 @@
/etc/os-release
+ /usr/lib/os-release
Description
- The /etc/os-release file
- contains operating system identification data.
+ The /etc/os-release and
+ /usr/lib/os-release files contain
+ operating system identification data.
The basic file format of
os-release is a newline-separated
@@ -78,20 +80,38 @@
strings. Lines beginning with "#" shall be ignored as
comments.
- /etc/os-release contains
- data that is defined by the operating system vendor
- and should not be changed by the administrator.
+ The file /etc/os-release
+ takes precedence over
+ /usr/lib/os-release. Applications
+ should check for the former, and exclusively use its
+ data if it exists, and only fall back to
+ /usr/lib/os-release if it is
+ missing. Applications should not read data from both
+ files at the same
+ time. /usr/lib/os-release is the
+ recommended place to store OS release information as
+ part of vendor trees. Frequently,
+ /etc/os-release is simply a
+ symlink to /usr/lib/os-release,
+ to provide compatibility with applications only
+ looking at /etc.
+
+ os-release contains data
+ that is defined by the operating system vendor and
+ should generally not be changed by the
+ administrator.
As this file only encodes names and identifiers
it should not be localized.
- The file /etc/os-release might
- be a symlink to another file, but it is important that
+ The /etc/os-release and
+ /usr/lib/os-release files might
+ be symlinks to other files, but it is important that
the file is available from earliest boot on, and hence
must be located on the root file system.
For a longer rationale for
- /etc/os-release please refer to
+ os-release please refer to
the Announcement of /etc/os-release.
@@ -100,7 +120,7 @@
Options
The following OS identifications parameters may be set using
- /etc/os-release:
+ os-release: