X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fhostname-setup.c;h=03b0ce3b4dad805d94b2cb7de2afd3c9bb549e89;hb=f5b51ea7fcb0b6380c3ceb4d4f3f22f647c6fd32;hp=57baa7927504197d881a024ede7304cfad18ad3a;hpb=605f81a8968b2df8a28cca2cf11db99ab948a2af;p=elogind.git
diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
index 57baa7927..03b0ce3b4 100644
--- a/src/core/hostname-setup.c
+++ b/src/core/hostname-setup.c
@@ -19,10 +19,8 @@
along with systemd; If not, see .
***/
-#include
#include
#include
-#include
#include
#include "hostname-setup.h"
@@ -64,7 +62,7 @@ int hostname_setup(void) {
if (r == -ENOENT)
enoent = true;
else
- log_warning("Failed to read configured hostname: %s", strerror(-r));
+ log_warning_errno(r, "Failed to read configured hostname: %m");
hn = NULL;
} else
@@ -82,10 +80,8 @@ int hostname_setup(void) {
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;