summaryrefslogtreecommitdiff
path: root/src/firstboot
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2020-12-11 16:40:45 +0100
committerLennart Poettering <lennart@poettering.net>2020-12-15 17:59:48 +0100
commit52ef5dd7989d886945e18ab50de31bf5a21ba158 (patch)
treeed64c0d2c22b0ea1a1375c24ca692fdad3e4e07e /src/firstboot
parent9e815cf2c2d8463e58c6609edb6a33f9bb62e7b5 (diff)
downloadsystemd-52ef5dd7989d886945e18ab50de31bf5a21ba158.tar.gz
hostname-util: flagsify hostname_is_valid(), drop machine_name_is_valid()
Let's clean up hostname_is_valid() a bit: let's turn the second boolean argument into a more explanatory flags field, and add a flag that accepts the special name ".host" as valid. This is useful for the container logic, where the special hostname ".host" refers to the "root container", i.e. the host system itself, and can be specified at various places. let's also get rid of machine_name_is_valid(). It was just an alias, which is confusing and even more so now that we have the flags param.
Diffstat (limited to 'src/firstboot')
-rw-r--r--src/firstboot/firstboot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 742b43f9fc..48baae3f89 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -493,7 +493,7 @@ static int prompt_hostname(void) {
break;
}
- if (!hostname_is_valid(h, true)) {
+ if (!hostname_is_valid(h, VALID_HOSTNAME_TRAILING_DOT)) {
log_error("Specified hostname invalid.");
continue;
}
@@ -1135,7 +1135,7 @@ static int parse_argv(int argc, char *argv[]) {
break;
case ARG_HOSTNAME:
- if (!hostname_is_valid(optarg, true))
+ if (!hostname_is_valid(optarg, VALID_HOSTNAME_TRAILING_DOT))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Host name %s is not valid.", optarg);