mirror of
https://github.com/Jeffrey-Sardina/liberated-systemd.git
synced 2026-10-22 02:52:47 -05:00
tunaichao
641c19e21e
UnsetEnvironment= was applied to the environment block before the
command line was expanded. Since the expansion looks the variables up
in that same block, any variable listed in UnsetEnvironment= was
already gone when $VAR in ExecStart= and friends was expanded, and a
whole-word $VAR reference was dropped from the command line.
Let the expansion see the full environment block, and apply the
unsetting only to the environment block passed to the executed
process. This way UnsetEnvironment= can hide variables from the
executed process without breaking command lines that reference them.
Extend the exec-unsetenvironment test accordingly: the whole-word
$VAR6 argument must be expanded into a positional parameter for the
shell, while ${VAR6-X} must evaluate to X in the executed process.
Also document in both the UnsetEnvironment= description and the
"Environment Variables in Spawned Processes" section that the
unsetting happens after command line variable expansion.
Fixes: #43343
12 lines
707 B
Desktop File
12 lines
707 B
Desktop File
# SPDX-License-Identifier: LGPL-2.1-or-later
|
|
[Unit]
|
|
Description=Test for UnsetEnvironment
|
|
|
|
[Service]
|
|
# Variable expansion in the command line is done by the service manager before UnsetEnvironment= is
|
|
# applied, so $VAR6 is expanded, but the variable is not part of the environment of the executed bash.
|
|
ExecStart=bash -x -c 'test "$$FOO" = "bar" && test "$${QUUX-X}" = "X" && test "$$VAR3" = "value3" && test "$${VAR4-X}" = "X" && test "$$VAR5" = "value5" && test "$${X%b-X}" = "X" && test "$$1" = "value6" && test "$${VAR6-X}" = "X"' x $VAR6
|
|
Type=oneshot
|
|
Environment=FOO=bar QUUX=waldo VAR3=value3 VAR4=value4 VAR5=value5 X%b=%U VAR6=value6
|
|
UnsetEnvironment=QUUX=waldo VAR3=somethingelse VAR4 X%b=%U VAR6
|