X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fhostname%2Fhostnamectl.c;h=7e6922b0a0ed66c35084c8ca31440f8a6236a331;hp=8d8dc3d7f357e73a24def4fe363f08f28c45d168;hb=799298d6513e7d40125c19d46578bb870d047db4;hpb=fc7689bc9ccf9b94f9a9f666f84c79b8f5b84791 diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c index 8d8dc3d7f..7e6922b0a 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; @@ -48,40 +49,55 @@ static bool arg_transient = false; static bool arg_pretty = false; static bool arg_static = false; +static void polkit_agent_open_if_enabled(void) { + + /* Open the polkit agent as a child process if necessary */ + if (!arg_ask_password) + return; + + if (arg_transport != BUS_TRANSPORT_LOCAL) + return; + + polkit_agent_open(); +} + typedef struct StatusInfo { char *hostname; char *static_hostname; 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 *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", + " 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) @@ -91,25 +107,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); } @@ -133,7 +144,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); @@ -142,23 +153,43 @@ static int show_one_name(sd_bus *bus, const char* attr) { static int show_all_names(sd_bus *bus) { StatusInfo info = {}; - const struct bus_properties_map map[] = { - { "s", "Hostname", &info.hostname }, - { "s", "StaticHostname", &info.static_hostname }, - { "s", "PrettyHostname", &info.pretty_hostname }, - { "s", "IconName", &info.icon_name }, - { "s", "Chassis", &info.chassis }, + + 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) }, + { "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) }, {} }; + + 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: @@ -167,7 +198,15 @@ fail: free(info.pretty_hostname); free(info.icon_name); free(info.chassis); - return 0; + 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.architecture); + + return r; } static int show_status(sd_bus *bus, char **args, unsigned n) { @@ -191,12 +230,9 @@ static int show_status(sd_bus *bus, char **args, unsigned n) { static int set_simple_string(sd_bus *bus, const char *method, const char *value) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - static bool first=true; int r = 0; - if (first && arg_ask_password) - polkit_agent_open(); - first = false; + polkit_agent_open_if_enabled(); r = sd_bus_call_method( bus, @@ -275,7 +311,14 @@ 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 set_deployment(sd_bus *bus, char **args, unsigned n) { + assert(args); + assert(n == 2); + + return set_simple_string(bus, "SetDeployment", args[1]); } static int help(void) { @@ -284,17 +327,18 @@ 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" " 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", program_invocation_short_name); return 0; @@ -313,13 +357,13 @@ static int parse_argv(int argc, char *argv[]) { static const struct option options[] = { { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, ARG_VERSION }, - { "transient", no_argument, NULL, ARG_TRANSIENT }, - { "static", no_argument, NULL, ARG_STATIC }, - { "pretty", no_argument, NULL, ARG_PRETTY }, + { "transient", no_argument, NULL, ARG_TRANSIENT }, + { "static", no_argument, NULL, ARG_STATIC }, + { "pretty", no_argument, NULL, ARG_PRETTY }, { "host", required_argument, NULL, 'H' }, { "machine", required_argument, NULL, 'M' }, { "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD }, - { NULL, 0, NULL, 0 } + {} }; int c; @@ -332,8 +376,7 @@ static int parse_argv(int argc, char *argv[]) { switch (c) { case 'h': - help(); - return 0; + return help(); case ARG_VERSION: puts(PACKAGE_STRING); @@ -370,8 +413,7 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unhandled option"); } } @@ -394,6 +436,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-deployment", EQUAL, 2, set_deployment }, }; int left; @@ -457,8 +500,8 @@ static int hostnamectl_main(sd_bus *bus, int argc, char *argv[]) { } int main(int argc, char *argv[]) { - int r; _cleanup_bus_unref_ sd_bus *bus = NULL; + int r; setlocale(LC_ALL, ""); log_parse_environment();