chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f426cc5
)
hostnamectl: read kernel name and release from remote
author
Djalal Harouni
<tixxdz@opendz.org>
Wed, 23 Apr 2014 21:41:13 +0000
(22:41 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 23 Apr 2014 21:44:39 +0000
(23:44 +0200)
src/hostname/hostnamectl.c
patch
|
blob
|
history
diff --git
a/src/hostname/hostnamectl.c
b/src/hostname/hostnamectl.c
index 326f371746982d60457b8c5f724eca763a95bff8..70049d31f6c7ef22b13b605d15036e260e989e01 100644
(file)
--- a/
src/hostname/hostnamectl.c
+++ b/
src/hostname/hostnamectl.c
@@
-67,6
+67,8
@@
typedef struct StatusInfo {
char *pretty_hostname;
char *icon_name;
char *chassis;
char *pretty_hostname;
char *icon_name;
char *chassis;
+ 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
+78,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);
@@
-112,8
+113,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
+157,8
@@
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) },
+ { "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
+194,8
@@
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.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);