fragment: allow prefixing of the EnvironmentFile= path with - to ignore errors
This commit is contained in:
parent
06ac173943
commit
afe4bfe2c1
4
TODO
4
TODO
|
@ -1,3 +1,5 @@
|
||||||
|
* dbus should run with oom adjust set
|
||||||
|
|
||||||
* support caching password questions in plymouth and on the console
|
* support caching password questions in plymouth and on the console
|
||||||
https://bugzilla.redhat.com/show_bug.cgi?id=655538
|
https://bugzilla.redhat.com/show_bug.cgi?id=655538
|
||||||
|
|
||||||
|
@ -119,8 +121,6 @@
|
||||||
|
|
||||||
* global defaults for StandardOuput=xxx
|
* global defaults for StandardOuput=xxx
|
||||||
|
|
||||||
* Make EnvironmentFile=-/fooobar/waldo ingnore errors while reading /foobar/waldo
|
|
||||||
|
|
||||||
* mkswap/mke2fs is called on wrong devices in crypto devices.
|
* mkswap/mke2fs is called on wrong devices in crypto devices.
|
||||||
|
|
||||||
Fedora:
|
Fedora:
|
||||||
|
|
|
@ -275,8 +275,13 @@
|
||||||
contain new-line separated variable
|
contain new-line separated variable
|
||||||
assignments. Empty lines and lines
|
assignments. Empty lines and lines
|
||||||
starting with ; or # will be ignored,
|
starting with ; or # will be ignored,
|
||||||
which may be used for
|
which may be used for commenting. The
|
||||||
commenting.</para></listitem>
|
argument passed should be an absolute
|
||||||
|
file name, optionally prefixed with
|
||||||
|
"-", which indicates that if the file
|
||||||
|
does not exist it won't be read and no
|
||||||
|
error or warning message is
|
||||||
|
logged.</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
|
|
|
@ -1348,14 +1348,26 @@ static int config_parse_env_file(
|
||||||
FILE *f;
|
FILE *f;
|
||||||
int r;
|
int r;
|
||||||
char ***env = data;
|
char ***env = data;
|
||||||
|
bool ignore = false;
|
||||||
|
|
||||||
assert(filename);
|
assert(filename);
|
||||||
assert(lvalue);
|
assert(lvalue);
|
||||||
assert(rvalue);
|
assert(rvalue);
|
||||||
assert(data);
|
assert(data);
|
||||||
|
|
||||||
|
if (rvalue[0] == '-') {
|
||||||
|
ignore = true;
|
||||||
|
rvalue++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!path_is_absolute(rvalue)) {
|
||||||
|
log_error("[%s:%u] Path '%s' is not absolute, ignoring.", filename, line, rvalue);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (!(f = fopen(rvalue, "re"))) {
|
if (!(f = fopen(rvalue, "re"))) {
|
||||||
log_error("[%s:%u] Failed to open environment file '%s', ignoring: %m", filename, line, rvalue);
|
if (!ignore)
|
||||||
|
log_error("[%s:%u] Failed to open environment file '%s', ignoring: %m", filename, line, rvalue);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue