picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

hostnamectl: actually implement location support

Browse source
This commit is contained in:
Lennart Poettering 2014-08-15 17:06:10 +02:00
parent bf32f99f65
commit 41414fed51
1 changed files with 42 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/hostname/hostnamectl.c
View file

@ -68,6 +68,7 @@ typedef struct StatusInfo {
char *icon_name; char *icon_name;
char *chassis; char *chassis;
char *deployment; char *deployment;
char *location;
char *kernel_name; char *kernel_name;
char *kernel_release; char *kernel_release;
char *os_pretty_name; char *os_pretty_name;
@ -92,12 +93,19 @@ static void print_status_info(StatusInfo *i) {
!streq_ptr(i->hostname, i->static_hostname)) !streq_ptr(i->hostname, i->static_hostname))
printf("Transient hostname: %s\n", i->hostname); printf("Transient hostname: %s\n", i->hostname);
printf(" Icon name: %s\n" if (!isempty(i->icon_name))
" Chassis: %s\n" printf(" Icon name: %s\n",
" Deployment: %s\n", strna(i->icon_name));
strna(i->icon_name),
strna(i->chassis), if (!isempty(i->chassis))
strna(i->deployment)); printf(" Chassis: %s\n",
strna(i->chassis));
if (!isempty(i->deployment))
printf(" Deployment: %s\n", i->deployment);
if (!isempty(i->location))
printf(" Location: %s\n", i->location);
r = sd_id128_get_machine(&mid); r = sd_id128_get_machine(&mid);
if (r >= 0) if (r >= 0)
@ -155,22 +163,23 @@ static int show_all_names(sd_bus *bus) {
StatusInfo info = {}; StatusInfo info = {};
static const struct bus_properties_map hostname_map[] = { static const struct bus_properties_map hostname_map[] = {
{ "Hostname", "s", NULL, offsetof(StatusInfo, hostname) }, { "Hostname", "s", NULL, offsetof(StatusInfo, hostname) },
{ "StaticHostname", "s", NULL, offsetof(StatusInfo, static_hostname) }, { "StaticHostname", "s", NULL, offsetof(StatusInfo, static_hostname) },
{ "PrettyHostname", "s", NULL, offsetof(StatusInfo, pretty_hostname) }, { "PrettyHostname", "s", NULL, offsetof(StatusInfo, pretty_hostname) },
{ "IconName", "s", NULL, offsetof(StatusInfo, icon_name) }, { "IconName", "s", NULL, offsetof(StatusInfo, icon_name) },
{ "Chassis", "s", NULL, offsetof(StatusInfo, chassis) }, { "Chassis", "s", NULL, offsetof(StatusInfo, chassis) },
{ "Deployment", "s", NULL, offsetof(StatusInfo, deployment) }, { "Deployment", "s", NULL, offsetof(StatusInfo, deployment) },
{ "KernelName", "s", NULL, offsetof(StatusInfo, kernel_name) }, { "Location", "s", NULL, offsetof(StatusInfo, location) },
{ "KernelRelease", "s", NULL, offsetof(StatusInfo, kernel_release) }, { "KernelName", "s", NULL, offsetof(StatusInfo, kernel_name) },
{ "OperatingSystemPrettyName", "s", NULL, offsetof(StatusInfo, os_pretty_name) }, { "KernelRelease", "s", NULL, offsetof(StatusInfo, kernel_release) },
{ "OperatingSystemCPEName", "s", NULL, offsetof(StatusInfo, os_cpe_name) }, { "OperatingSystemPrettyName", "s", NULL, offsetof(StatusInfo, os_pretty_name) },
{ "OperatingSystemCPEName", "s", NULL, offsetof(StatusInfo, os_cpe_name) },
{} {}
}; };
static const struct bus_properties_map manager_map[] = { static const struct bus_properties_map manager_map[] = {
{ "Virtualization", "s", NULL, offsetof(StatusInfo, virtualization) }, { "Virtualization", "s", NULL, offsetof(StatusInfo, virtualization) },
{ "Architecture", "s", NULL, offsetof(StatusInfo, architecture) }, { "Architecture", "s", NULL, offsetof(StatusInfo, architecture) },
{} {}
}; };
@ -199,6 +208,7 @@ fail:
free(info.icon_name); free(info.icon_name);
free(info.chassis); free(info.chassis);
free(info.deployment); free(info.deployment);
free(info.location);
free(info.kernel_name); free(info.kernel_name);
free(info.kernel_release); free(info.kernel_release);
free(info.os_pretty_name); free(info.os_pretty_name);
@ -321,6 +331,13 @@ static int set_deployment(sd_bus *bus, char **args, unsigned n) {
return set_simple_string(bus, "SetDeployment", args[1]); return set_simple_string(bus, "SetDeployment", args[1]);
} }
static int set_location(sd_bus *bus, char **args, unsigned n) {
assert(args);
assert(n == 2);
return set_simple_string(bus, "SetLocation", args[1]);
}
static void help(void) { static void help(void) {
printf("%s [OPTIONS...] COMMAND ...\n\n" printf("%s [OPTIONS...] COMMAND ...\n\n"
"Query or change system hostname.\n\n" "Query or change system hostname.\n\n"
@ -338,6 +355,7 @@ static void help(void) {
" set-icon-name NAME Set icon name for host\n" " set-icon-name NAME Set icon name for host\n"
" set-chassis NAME Set chassis type for host\n" " set-chassis NAME Set chassis type for host\n"
" set-deployment NAME Set deployment environment for host\n" " set-deployment NAME Set deployment environment for host\n"
" set-location NAME Set location for host\n"
, program_invocation_short_name); , program_invocation_short_name);
} }
@ -429,11 +447,12 @@ static int hostnamectl_main(sd_bus *bus, int argc, char *argv[]) {
const int argc; const int argc;
int (* const dispatch)(sd_bus *bus, char **args, unsigned n); int (* const dispatch)(sd_bus *bus, char **args, unsigned n);
} verbs[] = { } verbs[] = {
{ "status", LESS, 1, show_status }, { "status", LESS, 1, show_status },
{ "set-hostname", EQUAL, 2, set_hostname }, { "set-hostname", EQUAL, 2, set_hostname },
{ "set-icon-name", EQUAL, 2, set_icon_name }, { "set-icon-name", EQUAL, 2, set_icon_name },
{ "set-chassis", EQUAL, 2, set_chassis }, { "set-chassis", EQUAL, 2, set_chassis },
{ "set-deployment", EQUAL, 2, set_deployment }, { "set-deployment", EQUAL, 2, set_deployment },
{ "set-location", EQUAL, 2, set_location },
}; };
int left; int left;