X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fhostname%2Fhostnamectl.c;h=d108a2489dfee175c3a3e2a747af1c5db763d97c;hp=265c7ecbfe6ccc1c2bf14b1bcce03737cd2979ca;hb=546158bc6f46f8004cc11e81d19d223e0da56730;hpb=59f432ea6d6d441d0af7c76c37e80730c8df473a diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c index 265c7ecbf..d108a2489 100644 --- a/src/hostname/hostnamectl.c +++ b/src/hostname/hostnamectl.c @@ -36,6 +36,7 @@ #include "strv.h" #include "sd-id128.h" #include "virt.h" +#include "fileio.h" static enum transport { TRANSPORT_NORMAL, @@ -63,6 +64,7 @@ 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) { @@ -77,14 +79,20 @@ static void print_status_info(StatusInfo *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) @@ -133,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; } @@ -146,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); @@ -170,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) { @@ -208,29 +217,9 @@ 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; + dbus_bool_t interactive = arg_ask_password; _cleanup_free_ char *h = NULL; const char *hostname = args[1]; int r; @@ -241,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", @@ -249,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) { @@ -277,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,7 +311,7 @@ static int set_hostname(DBusConnection *bus, char **args, unsigned n) { static int set_icon_name(DBusConnection *bus, char **args, unsigned n) { _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; - dbus_bool_t interactive = true; + dbus_bool_t interactive = arg_ask_password; assert(args); assert(n == 2); @@ -321,6 +331,28 @@ 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 = arg_ask_password; + + 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" @@ -330,12 +362,14 @@ static int help(void) { " --transient Only set transient hostname\n" " --static Only set static hostname\n" " --pretty Only set pretty hostname\n" + " -P --privileged Acquire privileges before execution\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", + " 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; @@ -378,7 +412,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; @@ -434,9 +467,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", EQUAL, 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;