daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
923a60
From 99afbf6e7fac9f33f0f96c0397c413ba360607a2 Mon Sep 17 00:00:00 2001
923a60
From: Filipe Brandenburger <filbranden@google.com>
923a60
Date: Tue, 13 Oct 2015 00:12:39 -0700
923a60
Subject: [PATCH] man: Update man page documentation for CPUAffinity
923a60
923a60
Document support for commas as a separator and possibility of specifying
923a60
ranges of CPU indices.
923a60
923a60
Tested by regenerating the manpages locally and reading them on man.
923a60
923a60
(cherry picked from commit 71b1c27a406271b71f64487ae70b58f44a4a37f0)
923a60
Resolves: #1493976
923a60
---
923a60
 man/systemd-system.conf.xml | 6 ++++--
923a60
 man/systemd.exec.xml        | 6 ++++--
923a60
 2 files changed, 8 insertions(+), 4 deletions(-)
923a60
923a60
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
923a60
index 53e8ff665a..1861bb03f0 100644
923a60
--- a/man/systemd-system.conf.xml
923a60
+++ b/man/systemd-system.conf.xml
923a60
@@ -117,8 +117,10 @@
923a60
         <term><varname>CPUAffinity=</varname></term>
923a60
 
923a60
         <listitem><para>Configures the initial CPU affinity for the
923a60
-        init process. Takes a space-separated list of CPU
923a60
-        indices.</para></listitem>
923a60
+        init process. Takes a list of CPU indices or ranges separated
923a60
+        by either whitespace or commas. CPU ranges are specified by
923a60
+        the lower and upper CPU indices separated by a
923a60
+        dash.</para></listitem>
923a60
       </varlistentry>
923a60
 
923a60
       <varlistentry>
923a60
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
923a60
index 508146f06c..d7503b8e81 100644
923a60
--- a/man/systemd.exec.xml
923a60
+++ b/man/systemd.exec.xml
923a60
@@ -211,8 +211,10 @@
923a60
         <term><varname>CPUAffinity=</varname></term>
923a60
 
923a60
         <listitem><para>Controls the CPU affinity of the executed
923a60
-        processes. Takes a space-separated list of CPU indices. This
923a60
-        option may be specified more than once in which case the
923a60
+        processes. Takes a list of CPU indices or ranges separated by
923a60
+        either whitespace or commas. CPU ranges are specified by the
923a60
+        lower and upper CPU indices separated by a dash.
923a60
+        This option may be specified more than once in which case the
923a60
         specified CPU affinity masks are merged. If the empty string
923a60
         is assigned, the mask is reset, all assignments prior to this
923a60
         will have no effect. See