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

tmpfiles: consider /etc uninitialized also when /etc/machine-id is present but empty (#7849)

Browse source
This commit is contained in:
Franck Bui 2018-01-10 23:28:44 +01:00 committed by Lennart Poettering
parent a9883559e3
commit d8dab75789
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/tmpfiles/tmpfiles.c
View file

@ -199,12 +199,12 @@ static const Specifier specifier_table[] = {
static int specifier_machine_id_safe(char specifier, void *data, void *userdata, char **ret) { static int specifier_machine_id_safe(char specifier, void *data, void *userdata, char **ret) {
int r; int r;
/* If /etc/machine_id is missing (e.g. in a chroot environment), returns /* If /etc/machine_id is missing or empty (e.g. in a chroot environment)
* a recognizable error so that the caller can skip the rule * return a recognizable error so that the caller can skip the rule
* gracefully. */ * gracefully. */
r = specifier_machine_id(specifier, data, userdata, ret); r = specifier_machine_id(specifier, data, userdata, ret);
if (r == -ENOENT) if (IN_SET(r, -ENOENT, -ENOMEDIUM))
return -ENXIO; return -ENXIO;
return r; return r;