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: check options as well as fstype for network mounts
[elogind.git]
/
src
/
core
/
hostname-setup.c
diff --git
a/src/core/hostname-setup.c
b/src/core/hostname-setup.c
index 7894f8a5f2e5f35528d8512e5359f73a778c375e..6664e8952c2b30de430f4b241d0d307f78e30a87 100644
(file)
--- a/
src/core/hostname-setup.c
+++ b/
src/core/hostname-setup.c
@@
-29,6
+29,7
@@
#include "macro.h"
#include "util.h"
#include "log.h"
#include "macro.h"
#include "util.h"
#include "log.h"
+#include "fileio.h"
static int read_and_strip_hostname(const char *path, char **hn) {
char *s;
static int read_and_strip_hostname(const char *path, char **hn) {
char *s;
@@
-41,7
+42,7
@@
static int read_and_strip_hostname(const char *path, char **hn) {
if (r < 0)
return r;
if (r < 0)
return r;
- hostname_cleanup(s);
+ hostname_cleanup(s
, false
);
if (isempty(s)) {
free(s);
if (isempty(s)) {
free(s);
@@
-63,7
+64,7
@@
int hostname_setup(void) {
if (r == -ENOENT)
enoent = true;
else
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
hn = NULL;
} else
@@
-81,10
+82,8
@@
int hostname_setup(void) {
hn = "localhost";
}
hn = "localhost";
}
- if (sethostname(hn, strlen(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;