util: introduce sethostname_idempotent

Function queries system hostname and applies changes only when necessary. Also,
migrate all client of sethostname to sethostname_idempotent while at it.
This commit is contained in:
Michal Sekletar
2014-10-27 10:37:46 +01:00
parent caa2f4c0c9
commit 605f81a896
5 changed files with 25 additions and 3 deletions
+1 -1
View File
@@ -82,7 +82,7 @@ int hostname_setup(void) {
hn = "localhost";
}
if (sethostname(hn, strlen(hn)) < 0) {
if (sethostname_idempotent(hn) < 0) {
log_warning("Failed to set hostname to <%s>: %m", hn);
return -errno;
}
+1 -1
View File
@@ -287,7 +287,7 @@ static int context_update_kernel_hostname(Context *c) {
else
hn = "localhost";
if (sethostname(hn, strlen(hn)) < 0)
if (sethostname_idempotent(hn) < 0)
return -errno;
return 0;
+1 -1
View File
@@ -1289,7 +1289,7 @@ static int setup_hostname(void) {
if (arg_share_system)
return 0;
if (sethostname(arg_machine, strlen(arg_machine)) < 0)
if (sethostname_idempotent(arg_machine) < 0)
return -errno;
return 0;
+20
View File
@@ -7175,3 +7175,23 @@ int free_and_strdup(char **p, const char *s) {
return 0;
}
int sethostname_idempotent(const char *s) {
int r;
char buf[HOST_NAME_MAX + 1] = {};
assert(s);
r = gethostname(buf, sizeof(buf));
if (r < 0)
return -errno;
if (streq(buf, s))
return 0;
r = sethostname(buf, strlen(buf));
if (r < 0)
return -errno;
return 1;
}
+2
View File
@@ -997,3 +997,5 @@ int unquote_first_word(const char **p, char **ret);
int unquote_many_words(const char **p, ...) _sentinel_;
int free_and_strdup(char **p, const char *s);
int sethostname_idempotent(const char *s);