picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fragment: allow prefixing of the EnvironmentFile= path with - to ignore errors

This commit is contained in:
Lennart Poettering 2011-01-06 01:39:08 +01:00
parent 06ac173943
commit afe4bfe2c1
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TODO
View File

@ -1,3 +1,5 @@
* dbus should run with oom adjust set
* support caching password questions in plymouth and on the console
https://bugzilla.redhat.com/show_bug.cgi?id=655538
@ -119,8 +121,6 @@
* 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.
Fedora:

9
man/systemd.exec.xml
View File

@ -275,8 +275,13 @@
contain new-line separated variable
assignments. Empty lines and lines
starting with ; or # will be ignored,
which may be used for
commenting.</para></listitem>
which may be used for commenting. The
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>

14
src/load-fragment.c
View File

@ -1348,14 +1348,26 @@ static int config_parse_env_file(
FILE *f;
int r;
char ***env = data;
bool ignore = false;
assert(filename);
assert(lvalue);
assert(rvalue);
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"))) {
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;
}