chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: always explicitly close bus from main programs
[elogind.git]
/
src
/
hostname
/
hostnamectl.c
diff --git
a/src/hostname/hostnamectl.c
b/src/hostname/hostnamectl.c
index 326f371746982d60457b8c5f724eca763a95bff8..f8e1a811f8ccdce639145921c31e91c69e267980 100644
(file)
--- a/
src/hostname/hostnamectl.c
+++ b/
src/hostname/hostnamectl.c
@@
-35,7
+35,7
@@
#include "util.h"
#include "spawn-polkit-agent.h"
#include "build.h"
#include "util.h"
#include "spawn-polkit-agent.h"
#include "build.h"
-#include "
hwclock
.h"
+#include "
clock-util
.h"
#include "strv.h"
#include "sd-id128.h"
#include "virt.h"
#include "strv.h"
#include "sd-id128.h"
#include "virt.h"
@@
-67,6
+67,9
@@
typedef struct StatusInfo {
char *pretty_hostname;
char *icon_name;
char *chassis;
char *pretty_hostname;
char *icon_name;
char *chassis;
+ char *deployment;
+ char *kernel_name;
+ char *kernel_release;
char *os_pretty_name;
char *os_cpe_name;
char *virtualization;
char *os_pretty_name;
char *os_cpe_name;
char *virtualization;
@@
-76,7
+79,6
@@
typedef struct StatusInfo {
static void print_status_info(StatusInfo *i) {
sd_id128_t mid = {}, bid = {};
int r;
static void print_status_info(StatusInfo *i) {
sd_id128_t mid = {}, bid = {};
int r;
- struct utsname u;
assert(i);
assert(i);
@@
-91,9
+93,11
@@
static void print_status_info(StatusInfo *i) {
printf("Transient hostname: %s\n", i->hostname);
printf(" Icon name: %s\n"
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->icon_name),
- strna(i->chassis));
+ strna(i->chassis),
+ strna(i->deployment));
r = sd_id128_get_machine(&mid);
if (r >= 0)
r = sd_id128_get_machine(&mid);
if (r >= 0)
@@
-112,8
+116,8
@@
static void print_status_info(StatusInfo *i) {
if (!isempty(i->os_cpe_name))
printf(" CPE OS Name: %s\n", i->os_cpe_name);
if (!isempty(i->os_cpe_name))
printf(" CPE OS Name: %s\n", i->os_cpe_name);
- assert_se(uname(&u) >= 0);
-
printf(" Kernel: %s %s\n", u.sysname, u.
release);
+ if (!isempty(i->kernel_name) && !isempty(i->kernel_release))
+
printf(" Kernel: %s %s\n", i->kernel_name, i->kernel_
release);
if (!isempty(i->architecture))
printf(" Architecture: %s\n", i->architecture);
if (!isempty(i->architecture))
printf(" Architecture: %s\n", i->architecture);
@@
-156,6
+160,9
@@
static int show_all_names(sd_bus *bus) {
{ "PrettyHostname", "s", NULL, offsetof(StatusInfo, pretty_hostname) },
{ "IconName", "s", NULL, offsetof(StatusInfo, icon_name) },
{ "Chassis", "s", NULL, offsetof(StatusInfo, chassis) },
{ "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) },
{ "OperatingSystemCPEName", "s", NULL, offsetof(StatusInfo, os_cpe_name) },
{}
{ "OperatingSystemPrettyName", "s", NULL, offsetof(StatusInfo, os_pretty_name) },
{ "OperatingSystemCPEName", "s", NULL, offsetof(StatusInfo, os_cpe_name) },
{}
@@
-191,6
+198,9
@@
fail:
free(info.pretty_hostname);
free(info.icon_name);
free(info.chassis);
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);
free(info.os_cpe_name);
free(info.virtualization);
free(info.os_pretty_name);
free(info.os_cpe_name);
free(info.virtualization);
@@
-304,8
+314,14
@@
static int set_chassis(sd_bus *bus, char **args, unsigned n) {
return set_simple_string(bus, "SetChassis", args[1]);
}
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"
printf("%s [OPTIONS...] COMMAND ...\n\n"
"Query or change system hostname.\n\n"
" -h --help Show this help\n"
@@
-320,10
+336,9
@@
static int help(void) {
" status Show current hostname settings\n"
" set-hostname NAME Set system hostname\n"
" set-icon-name NAME Set icon name for host\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[]) {
}
static int parse_argv(int argc, char *argv[]) {
@@
-353,12
+368,13
@@
static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(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':
switch (c) {
case 'h':
- return help();
+ help();
+ return 0;
case ARG_VERSION:
puts(PACKAGE_STRING);
case ARG_VERSION:
puts(PACKAGE_STRING);
@@
-397,7
+413,6
@@
static int parse_argv(int argc, char *argv[]) {
default:
assert_not_reached("Unhandled option");
}
default:
assert_not_reached("Unhandled option");
}
- }
return 1;
}
return 1;
}
@@
-418,6
+433,7
@@
static int hostnamectl_main(sd_bus *bus, int argc, char *argv[]) {
{ "set-hostname", EQUAL, 2, set_hostname },
{ "set-icon-name", EQUAL, 2, set_icon_name },
{ "set-chassis", EQUAL, 2, set_chassis },
{ "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 left;
@@
-481,7
+497,7
@@
static int hostnamectl_main(sd_bus *bus, int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
}
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, "");
int r;
setlocale(LC_ALL, "");