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

volatile-util: tweak query_volatile_mode() a bit

Browse source
This commit is contained in:
Lennart Poettering 2018-12-19 14:52:26 +01:00
parent e5a4bb0d4e
commit 68abaa0929
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/shared/volatile-util.c
View file

@ -12,27 +12,28 @@
int query_volatile_mode(VolatileMode *ret) {
_cleanup_free_ char *mode = NULL;
VolatileMode m = VOLATILE_NO;
int r;
r = proc_cmdline_get_key("systemd.volatile", PROC_CMDLINE_VALUE_OPTIONAL, &mode);
if (r < 0)
return r;
if (r == 0)
goto finish;
if (r == 0) {
*ret = VOLATILE_NO;
return 0;
}
if (mode) {
VolatileMode m;
m = volatile_mode_from_string(mode);
if (m < 0)
return -EINVAL;
*ret = m;
} else
m = VOLATILE_YES;
*ret = VOLATILE_YES;
r = 1;
finish:
*ret = m;
return r;
return 1;
}
static const char* const volatile_mode_table[_VOLATILE_MODE_MAX] = {