manager: add DefaultEnvironment option

This complements existing functionality of setting variables
through 'systemctl set-environment', the kernel command line,
and through normal environment variables for systemd in session
mode.

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index d8bfd1279d1db5c58c3c380837e04bfbba34a95b..588685540774d08a5d6499301641c65643268bb4 100644 (file)
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -262,6 +262,27 @@
                                 too.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><varname>DefaultEnvironment=</varname></term>
+
+                                <listitem><para>Sets systemd manager
+                                environment variables for executed
+                                processes. Takes a space-separated
+                                list of variable assignments.
+                                </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 about environment variables.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><varname>DefaultLimitCPU=</varname></term>
                                 <term><varname>DefaultLimitFSIZE=</varname></term>

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index ab1712efebd1e5cb2ddea00ee7f53ea001b8f29d..8d5948ab0797391a88a94a8e9d6bd0db8636520e 100644 (file)
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -288,8 +288,9 @@
                                 variables is reset, all prior
                                 assignments have no effect.
                                 Variable expansion is not performed
-                                inside the strings, and $ has no special
-                                meaning.
+                                inside the strings, however, specifier
+                                expansion is possible. $ character has
+                                no special meaning.
                                 If you need to assign a value containing spaces
                                 to a variable, use double quotes (")
                                 for the assignment.</para>

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 4a835b6e8b3739ac2a3143e4fb6e389c024513af..15fabe860e7e47b903f0a0fad3e4f4e9902237df 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1564,7 +1564,7 @@ int config_parse_environ(const char *unit,
         assert(filename);
         assert(lvalue);
         assert(rvalue);
-        assert(u);
+        assert(data);
 
         if (isempty(rvalue)) {
                 /* Empty assignment resets the list */
@@ -1573,7 +1573,11 @@ int config_parse_environ(const char *unit,
                 return 0;
         }
 
-        k = unit_full_printf(u, rvalue);
+        if (u)
+                k = unit_full_printf(u, rvalue);
+        else
+                k = strdup(rvalue);
+
         if (!k)
                 return log_oom();
 

diff --git a/src/core/main.c b/src/core/main.c
index 26aa561218f3f801a27451dc96b1f3c1f92285c3..470fecf15d797a29ec7cdfc865734b6351dd9bbf 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -94,6 +94,7 @@ static ExecOutput arg_default_std_output = EXEC_OUTPUT_JOURNAL;
 static ExecOutput arg_default_std_error = EXEC_OUTPUT_INHERIT;
 static usec_t arg_runtime_watchdog = 0;
 static usec_t arg_shutdown_watchdog = 10 * USEC_PER_MINUTE;
+static char **arg_default_environment = NULL;
 static struct rlimit *arg_default_rlimit[RLIMIT_NLIMITS] = {};
 static uint64_t arg_capability_bounding_set_drop = 0;
 static nsec_t arg_timer_slack_nsec = (nsec_t) -1;
@@ -646,6 +647,7 @@ static int parse_config_file(void) {
                 { "Manager", "ShutdownWatchdogSec",   config_parse_sec,          0, &arg_shutdown_watchdog   },
                 { "Manager", "CapabilityBoundingSet", config_parse_bounding_set, 0, &arg_capability_bounding_set_drop },
                 { "Manager", "TimerSlackNSec",        config_parse_nsec,         0, &arg_timer_slack_nsec    },
+                { "Manager", "DefaultEnvironment",    config_parse_environ,      0, &arg_default_environment },
                 { "Manager", "DefaultLimitCPU",       config_parse_limit,        0, &arg_default_rlimit[RLIMIT_CPU]},
                 { "Manager", "DefaultLimitFSIZE",     config_parse_limit,        0, &arg_default_rlimit[RLIMIT_FSIZE]},
                 { "Manager", "DefaultLimitDATA",      config_parse_limit,        0, &arg_default_rlimit[RLIMIT_DATA]},
@@ -1630,6 +1632,9 @@ int main(int argc, char *argv[]) {
         if (arg_default_controllers)
                 manager_set_default_controllers(m, arg_default_controllers);
 
+        if (arg_default_environment)
+                manager_set_default_environment(m, arg_default_environment);
+
         manager_set_show_status(m, arg_show_status);
 
         /* Remember whether we should queue the default job */

diff --git a/src/core/manager.c b/src/core/manager.c
index f16621ac2bbe38837b41eb64f05f9321124edb50..5c3a2c72f38d8335ec41200fbd1ff8551fefb3c8 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2570,6 +2570,18 @@ void manager_undo_generators(Manager *m) {
         remove_generator_dir(m, &m->generator_unit_path_late);
 }
 
+int manager_set_default_environment(Manager *m, char **environment) {
+
+        char **e = NULL;
+        assert(m);
+        e = strv_env_merge(2, m->environment, environment);
+        if (!e)
+                return -ENOMEM;
+        strv_free(m->environment);
+        m->environment = e;
+        return 0;
+}
+
 int manager_set_default_controllers(Manager *m, char **controllers) {
         char **l;
 

diff --git a/src/core/manager.h b/src/core/manager.h
index e21c8f7abf93d2fe5618e21acb4c25d1d49c3799..f0bb2eb035645893a133ecc0bf6afccb9fd666d4 100644 (file)
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -272,6 +272,7 @@ unsigned manager_dispatch_load_queue(Manager *m);
 unsigned manager_dispatch_run_queue(Manager *m);
 unsigned manager_dispatch_dbus_queue(Manager *m);
 
+int manager_set_default_environment(Manager *m, char **environment);
 int manager_set_default_controllers(Manager *m, char **controllers);
 int manager_set_default_rlimits(Manager *m, struct rlimit **default_rlimit);
 

diff --git a/src/core/system.conf b/src/core/system.conf
index 508e0f5fa4498aabebf87af081ea5ac5eace8df4..f2817bc507122eab0544c20ff31f400b9c003101 100644 (file)
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -25,6 +25,7 @@
 #ShutdownWatchdogSec=10min
 #CapabilityBoundingSet=
 #TimerSlackNSec=
+#DefaultEnvironment=
 #DefaultLimitCPU=
 #DefaultLimitFSIZE=
 #DefaultLimitDATA=