3d03076e5d
removing them. - Add systemd-fix-merge-ignore-dependencies.patch: fix merging with --ignore-dependencies waiting for dependencies (bnc#800365). - Update systemd-numlock-suse.patch: udev-trigger.service is now called systemd-udev-trigger.service. - Add improve-man-environment.patch: improve manpage regarding Environment value. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=333
45 lines
2.2 KiB
Diff
45 lines
2.2 KiB
Diff
From 2cfd1ed4d853be4a22cc102037347c9041bf5ced Mon Sep 17 00:00:00 2001
|
|
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Thu, 24 Jan 2013 17:55:42 +0100
|
|
Subject: [PATCH] man: systemd.exec - explicit Environment assignment
|
|
|
|
Be more verbose about using space in Environment field and not
|
|
using value of other variables
|
|
|
|
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=840260
|
|
---
|
|
man/systemd.exec.xml | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
Index: systemd-195/man/systemd.exec.xml
|
|
===================================================================
|
|
--- systemd-195.orig/man/systemd.exec.xml
|
|
+++ systemd-195/man/systemd.exec.xml
|
|
@@ -269,9 +269,24 @@
|
|
in which case all listed variables
|
|
will be set. If the same variable is
|
|
set twice the later setting will
|
|
- override the earlier setting. See
|
|
+ override the earlier setting.
|
|
+ Variable expansion is not performed
|
|
+ inside the strings, and $ has no special
|
|
+ meaning.
|
|
+ If you need to assign a value containing spaces
|
|
+ to a variable, use double quotes (")
|
|
+ for the assignment.</para>
|
|
+
|
|
+ <para>Example:
|
|
+ <programlisting>Environment="VAR1=word1 word2" VAR2=word3 "VAR3=word 5 6"</programlisting>
|
|
+ gives three variables <literal>VAR1</literal>,
|
|
+ <literal>VAR2</literal>, <literal>VAR3</literal>.
|
|
+ </para>
|
|
+
|
|
+ <para>
|
|
+ See
|
|
<citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>
|
|
- for details.</para></listitem>
|
|
+ for details about environment variables.</para></listitem>
|
|
</varlistentry>
|
|
<varlistentry>
|
|
<term><varname>EnvironmentFile=</varname></term>
|