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

systemd-sleep: it is not an error if the config file is missing

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-05-07 11:35:23 -04:00
parent 4d5fb96252
commit 0ee8d63649
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/shared/sleep-config.c
View File

@ -47,19 +47,16 @@ int parse_sleep_config(const char *verb, char ***modes, char ***states) {
FILE _cleanup_fclose_ *f;
f = fopen(PKGSYSCONFDIR "/sleep.conf", "re");
if (!f) {
if (errno == ENOENT)
return 0;
log_warning("Failed to open configuration file " PKGSYSCONFDIR "/sleep.conf: %m");
return 0;
if (!f)
log_full(errno == ENOENT ? LOG_DEBUG: LOG_WARNING,
"Failed to open configuration file " PKGSYSCONFDIR "/sleep.conf: %m");
else {
r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0",
config_item_table_lookup, (void*) items, false, false, NULL);
if (r < 0)
log_warning("Failed to parse configuration file: %s", strerror(-r));
}
r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0",
config_item_table_lookup, (void*) items, false, false, NULL);
if (r < 0)
log_warning("Failed to parse configuration file: %s", strerror(-r));
if (streq(verb, "suspend")) {
/* empty by default */
*modes = suspend_mode;