X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fhostname%2Fhostnamectl.c;h=267cd7401103b357816b9de4398ff2e0786b244c;hp=523177b27d4d412d54d7734c25130956a1aea4a4;hb=638ca89c53e2b897cfb3f627f4acbc7d09af2f4c;hpb=46e65dcc3a522b5e992e165b5e61d14254026859 diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c index 523177b27..267cd7401 100644 --- a/src/hostname/hostnamectl.c +++ b/src/hostname/hostnamectl.c @@ -35,10 +35,11 @@ #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 "architecture.h" #include "fileio.h" static bool arg_ask_password = true; @@ -66,29 +67,29 @@ typedef struct StatusInfo { 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 *architecture; } StatusInfo; static void print_status_info(StatusInfo *i) { - sd_id128_t mid, bid; + sd_id128_t mid = {}, bid = {}; int r; - const char *id = NULL; - _cleanup_free_ char *pretty_name = NULL, *cpe_name = NULL; - struct utsname u; assert(i); - printf(" Static hostname: %s\n", - strna(i->static_hostname)); + printf(" Static hostname: %s\n", strna(i->static_hostname)); if (!isempty(i->pretty_hostname) && !streq_ptr(i->pretty_hostname, i->static_hostname)) - printf(" Pretty hostname: %s\n", - strna(i->pretty_hostname)); + printf(" Pretty hostname: %s\n", i->pretty_hostname); if (!isempty(i->hostname) && !streq_ptr(i->hostname, i->static_hostname)) - printf("Transient hostname: %s\n", - strna(i->hostname)); + printf("Transient hostname: %s\n", i->hostname); printf(" Icon name: %s\n" " Chassis: %s\n", @@ -103,25 +104,20 @@ static void print_status_info(StatusInfo *i) { if (r >= 0) printf(" Boot ID: " SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(bid)); - if (detect_virtualization(&id) > 0) - printf(" Virtualization: %s\n", id); + if (!isempty(i->virtualization)) + printf(" Virtualization: %s\n", i->virtualization); - r = parse_env_file("/etc/os-release", NEWLINE, - "PRETTY_NAME", &pretty_name, - "CPE_NAME", &cpe_name, - NULL); - if (r < 0) - log_warning("Failed to read /etc/os-release: %s", strerror(-r)); + if (!isempty(i->os_pretty_name)) + printf(" Operating System: %s\n", i->os_pretty_name); - if (!isempty(pretty_name)) - printf(" Operating System: %s\n", pretty_name); + if (!isempty(i->os_cpe_name)) + printf(" CPE OS Name: %s\n", i->os_cpe_name); - if (!isempty(cpe_name)) - printf(" CPE OS Name: %s\n", cpe_name); + if (!isempty(i->kernel_name) && !isempty(i->kernel_release)) + printf(" Kernel: %s %s\n", i->kernel_name, i->kernel_release); - assert_se(uname(&u) >= 0); - printf(" Kernel: %s %s\n" - " Architecture: %s\n", u.sysname, u.release, u.machine); + if (!isempty(i->architecture)) + printf(" Architecture: %s\n", i->architecture); } @@ -145,7 +141,7 @@ static int show_one_name(sd_bus *bus, const char* attr) { r = sd_bus_message_read(reply, "s", &s); if (r < 0) - return r; + return bus_log_parse_error(r); printf("%s\n", s); @@ -154,24 +150,42 @@ static int show_one_name(sd_bus *bus, const char* attr) { static int show_all_names(sd_bus *bus) { StatusInfo info = {}; - static const struct bus_properties_map map[] = { + + static const struct bus_properties_map hostname_map[] = { { "Hostname", "s", NULL, offsetof(StatusInfo, hostname) }, { "StaticHostname", "s", NULL, offsetof(StatusInfo, static_hostname) }, { "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) }, + {} + }; + + static const struct bus_properties_map manager_map[] = { + { "Virtualization", "s", NULL, offsetof(StatusInfo, virtualization) }, + { "Architecture", "s", NULL, offsetof(StatusInfo, architecture) }, {} }; + int r; r = bus_map_all_properties(bus, "org.freedesktop.hostname1", "/org/freedesktop/hostname1", - map, + hostname_map, &info); if (r < 0) goto fail; + bus_map_all_properties(bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + manager_map, + &info); + print_status_info(&info); fail: @@ -180,7 +194,14 @@ fail: free(info.pretty_hostname); free(info.icon_name); free(info.chassis); - return 0; + free(info.kernel_name); + free(info.kernel_release); + free(info.os_pretty_name); + free(info.os_cpe_name); + free(info.virtualization); + free(info.architecture); + + return r; } static int show_status(sd_bus *bus, char **args, unsigned n) { @@ -285,7 +306,7 @@ static int set_chassis(sd_bus *bus, char **args, unsigned n) { assert(args); assert(n == 2); - return set_simple_string(bus, "SetChasis", args[1]); + return set_simple_string(bus, "SetChassis", args[1]); } static int help(void) { @@ -294,12 +315,12 @@ static int help(void) { "Query or change system hostname.\n\n" " -h --help Show this help\n" " --version Show package version\n" - " --transient Only set transient hostname\n" - " --static Only set static hostname\n" - " --pretty Only set pretty hostname\n" " --no-ask-password Do not prompt for password\n" " -H --host=[USER@]HOST Operate on remote host\n" - " -M --machine=CONTAINER Operate on local container\n\n" + " -M --machine=CONTAINER Operate on local container\n" + " --transient Only set transient hostname\n" + " --static Only set static hostname\n" + " --pretty Only set pretty hostname\n\n" "Commands:\n" " status Show current hostname settings\n" " set-hostname NAME Set system hostname\n"