X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fhostname%2Fhostnamectl.c;h=064581a31cfdb26b81829fadc3b1e6bf04345fab;hp=de2f7242ea1e4307fc7b4ed607b4ba10c8697edc;hb=c0b21b9669a86a5e404b73865080494063ee8351;hpb=dbc4fbae58e39cb0d33738f0a4d1e74511ed1fb5 diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c index de2f7242e..064581a31 100644 --- a/src/hostname/hostnamectl.c +++ b/src/hostname/hostnamectl.c @@ -23,8 +23,10 @@ #include #include #include +#include #include #include +#include #include "dbus-common.h" #include "util.h" @@ -34,6 +36,7 @@ #include "strv.h" #include "sd-id128.h" #include "virt.h" +#include "fileio.h" static enum transport { TRANSPORT_NORMAL, @@ -61,26 +64,35 @@ typedef struct StatusInfo { const char *static_hostname; const char *pretty_hostname; const char *icon_name; + const char *chassis; } StatusInfo; static void print_status_info(StatusInfo *i) { sd_id128_t mid, bid; int r; - const char *id; + 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)); - if (!streq_ptr(i->hostname, 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)); + + if (!isempty(i->hostname) && + !streq_ptr(i->hostname, i->static_hostname)) printf("Transient hostname: %s\n", strna(i->hostname)); - printf(" Pretty hostname: %s\n" - " Icon name: %s\n", - strna(i->pretty_hostname), - strna(i->icon_name)); + printf(" Icon name: %s\n" + " Chassis: %s\n", + strna(i->icon_name), + strna(i->chassis)); r = sd_id128_get_machine(&mid); if (r >= 0) @@ -90,8 +102,24 @@ 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) + if (detect_virtualization(&id) > 0) printf(" Virtualization: %s\n", id); + + r = parse_env_file("/etc/os-release", NEWLINE, + "PRETTY_NAME", &pretty_name, + "CPE_NAME", &cpe_name, + NULL); + + if (!isempty(pretty_name)) + printf(" Operating System: %s\n", pretty_name); + + if (!isempty(cpe_name)) + printf(" CPE OS Name: %s\n", cpe_name); + + assert_se(uname(&u) >= 0); + printf(" Kernel: %s %s\n" + " Architecture: %s\n", u.sysname, u.release, u.machine); + } static int status_property(const char *name, DBusMessageIter *iter, StatusInfo *i) { @@ -113,6 +141,8 @@ static int status_property(const char *name, DBusMessageIter *iter, StatusInfo * i->pretty_hostname = s; if (streq(name, "IconName")) i->icon_name = s; + if (streq(name, "Chassis")) + i->chassis = s; } break; } @@ -126,7 +156,7 @@ static int show_status(DBusConnection *bus, char **args, unsigned n) { const char *interface = ""; int r; DBusMessageIter iter, sub, sub2, sub3; - StatusInfo info; + StatusInfo info = {}; assert(args); @@ -150,7 +180,6 @@ static int show_status(DBusConnection *bus, char **args, unsigned n) { return -EIO; } - zero(info); dbus_message_iter_recurse(&iter, &sub); while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) { @@ -188,26 +217,6 @@ static int show_status(DBusConnection *bus, char **args, unsigned n) { return 0; } -static char* hostname_simplify(char *s) { - char *p, *d; - - for (p = s, d = s; *p; p++) { - if ((*p >= 'a' && *p <= 'z') || - (*p >= '0' && *p <= '9') || - *p == '-' || *p == '_') - *(d++) = *p; - else if (*p >= 'A' && *p <= 'Z') - *(d++) = *p - 'A' + 'a'; - else if (*p == ' ') - *(d++) = '-'; - } - - *d = 0; - - strshorten(s, HOST_NAME_MAX); - return s; -} - static int set_hostname(DBusConnection *bus, char **args, unsigned n) { _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; dbus_bool_t interactive = true; @@ -221,6 +230,27 @@ static int set_hostname(DBusConnection *bus, char **args, unsigned n) { polkit_agent_open_if_enabled(); if (arg_set_pretty) { + const char *p; + + /* If the passed hostname is already valid, then + * assume the user doesn't know anything about pretty + * hostnames, so let's unset the pretty hostname, and + * just set the passed hostname as static/dynamic + * hostname. */ + + h = strdup(hostname); + if (!h) + return log_oom(); + + hostname_cleanup(h, true); + + if (arg_set_static && streq(h, hostname)) + p = ""; + else { + p = hostname; + hostname = h; + } + r = bus_method_call_with_reply( bus, "org.freedesktop.hostname1", @@ -229,17 +259,14 @@ static int set_hostname(DBusConnection *bus, char **args, unsigned n) { "SetPrettyHostname", &reply, NULL, - DBUS_TYPE_STRING, &hostname, + DBUS_TYPE_STRING, &p, DBUS_TYPE_BOOLEAN, &interactive, DBUS_TYPE_INVALID); if (r < 0) return r; - h = strdup(hostname); - if (!h) - return log_oom(); - - hostname = hostname_simplify(h); + dbus_message_unref(reply); + reply = NULL; } if (arg_set_static) { @@ -257,6 +284,9 @@ static int set_hostname(DBusConnection *bus, char **args, unsigned n) { if (r < 0) return r; + + dbus_message_unref(reply); + reply = NULL; } if (arg_set_transient) { @@ -301,21 +331,44 @@ static int set_icon_name(DBusConnection *bus, char **args, unsigned n) { DBUS_TYPE_INVALID); } +static int set_chassis(DBusConnection *bus, char **args, unsigned n) { + _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; + dbus_bool_t interactive = true; + + assert(args); + assert(n == 2); + + polkit_agent_open_if_enabled(); + + return bus_method_call_with_reply( + bus, + "org.freedesktop.hostname1", + "/org/freedesktop/hostname1", + "org.freedesktop.hostname1", + "SetChassis", + &reply, + NULL, + DBUS_TYPE_STRING, &args[1], + DBUS_TYPE_BOOLEAN, &interactive, + DBUS_TYPE_INVALID); +} + static int help(void) { - printf("%s [OPTIONS...] {COMMAND} ...\n\n" - "Query or set system hostname.\n\n" + printf("%s [OPTIONS...] COMMAND ...\n\n" + "Query or change system hostname.\n\n" " -h --help Show this help\n" " --version Show package version\n" - " --no-ask-password Do not prompt for password\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\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", + " 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; @@ -348,7 +401,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "hp:as:H:P", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "hH:P", options, NULL)) >= 0) { switch (c) { @@ -358,7 +411,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; @@ -383,6 +435,10 @@ static int parse_argv(int argc, char *argv[]) { arg_set_static = true; break; + case ARG_NO_ASK_PASSWORD: + arg_ask_password = false; + break; + case '?': return -EINVAL; @@ -410,9 +466,10 @@ static int hostnamectl_main(DBusConnection *bus, int argc, char *argv[], DBusErr const int argc; int (* const dispatch)(DBusConnection *bus, char **args, unsigned n); } verbs[] = { - { "status", LESS, 1, show_status }, - { "set-hostname", LESS, 2, set_hostname }, - { "set-icon-name", EQUAL, 2, set_icon_name }, + { "status", LESS, 1, show_status }, + { "set-hostname", EQUAL, 2, set_hostname }, + { "set-icon-name", EQUAL, 2, set_icon_name }, + { "set-chassis", EQUAL, 2, set_chassis }, }; int left; @@ -488,6 +545,7 @@ int main(int argc, char *argv[]) { dbus_error_init(&error); + setlocale(LC_ALL, ""); log_parse_environment(); log_open();