char *pretty_hostname;
char *icon_name;
char *chassis;
+ char *deployment;
char *kernel_name;
char *kernel_release;
char *os_pretty_name;
printf("Transient hostname: %s\n", i->hostname);
printf(" Icon name: %s\n"
- " Chassis: %s\n",
+ " Chassis: %s\n"
+ " Deployment: %s\n",
strna(i->icon_name),
- strna(i->chassis));
+ strna(i->chassis),
+ strna(i->deployment));
r = sd_id128_get_machine(&mid);
if (r >= 0)
{ "PrettyHostname", "s", NULL, offsetof(StatusInfo, pretty_hostname) },
{ "IconName", "s", NULL, offsetof(StatusInfo, icon_name) },
{ "Chassis", "s", NULL, offsetof(StatusInfo, chassis) },
+ { "Deployment", "s", NULL, offsetof(StatusInfo, deployment) },
{ "KernelName", "s", NULL, offsetof(StatusInfo, kernel_name) },
{ "KernelRelease", "s", NULL, offsetof(StatusInfo, kernel_release) },
{ "OperatingSystemPrettyName", "s", NULL, offsetof(StatusInfo, os_pretty_name) },
free(info.pretty_hostname);
free(info.icon_name);
free(info.chassis);
+ free(info.deployment);
free(info.kernel_name);
free(info.kernel_release);
free(info.os_pretty_name);
return set_simple_string(bus, "SetChassis", args[1]);
}
-static int help(void) {
+static int set_deployment(sd_bus *bus, char **args, unsigned n) {
+ assert(args);
+ assert(n == 2);
+ return set_simple_string(bus, "SetDeployment", args[1]);
+}
+
+static void help(void) {
printf("%s [OPTIONS...] COMMAND ...\n\n"
"Query or change system hostname.\n\n"
" -h --help Show this help\n"
" status Show current hostname settings\n"
" set-hostname NAME Set system hostname\n"
" set-icon-name NAME Set icon name for host\n"
- " set-chassis NAME Set chassis type for host\n",
- program_invocation_short_name);
-
- return 0;
+ " set-chassis NAME Set chassis type for host\n"
+ " set-deployment NAME Set deployment environment for host\n"
+ , program_invocation_short_name);
}
static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "hH:M:", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hH:M:", options, NULL)) >= 0)
switch (c) {
case 'h':
- return help();
+ help();
+ return 0;
case ARG_VERSION:
puts(PACKAGE_STRING);
default:
assert_not_reached("Unhandled option");
}
- }
return 1;
}
{ "set-hostname", EQUAL, 2, set_hostname },
{ "set-icon-name", EQUAL, 2, set_icon_name },
{ "set-chassis", EQUAL, 2, set_chassis },
+ { "set-deployment", EQUAL, 2, set_deployment },
};
int left;
}
int main(int argc, char *argv[]) {
- _cleanup_bus_unref_ sd_bus *bus = NULL;
+ _cleanup_bus_close_unref_ sd_bus *bus = NULL;
int r;
setlocale(LC_ALL, "");