chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount: be more careful about errors when parsing mtab
[elogind.git]
/
src
/
core
/
hostname-setup.c
diff --git
a/src/core/hostname-setup.c
b/src/core/hostname-setup.c
index 74ff64883f51d5224c046cb0fdfc618c88a514f2..6664e8952c2b30de430f4b241d0d307f78e30a87 100644
(file)
--- a/
src/core/hostname-setup.c
+++ b/
src/core/hostname-setup.c
@@
-64,7
+64,7
@@
int hostname_setup(void) {
if (r == -ENOENT)
enoent = true;
else
if (r == -ENOENT)
enoent = true;
else
- log_warning_errno(
-
r, "Failed to read configured hostname: %m");
+ log_warning_errno(r, "Failed to read configured hostname: %m");
hn = NULL;
} else
hn = NULL;
} else
@@
-82,10
+82,8
@@
int hostname_setup(void) {
hn = "localhost";
}
hn = "localhost";
}
- if (sethostname_idempotent(hn) < 0) {
- log_warning("Failed to set hostname to <%s>: %m", hn);
- return -errno;
- }
+ if (sethostname_idempotent(hn) < 0)
+ return log_warning_errno(errno, "Failed to set hostname to <%s>: %m", hn);
log_info("Set hostname to <%s>.", hn);
return 0;
log_info("Set hostname to <%s>.", hn);
return 0;