X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fhostname%2Fhostnamectl.c;h=ff1f091776bf748d1d3720ff9f2d6136c2408ffd;hb=b0ee8068da5bc9ed949656700274bb6ff60d2073;hp=1d448bd944f2d3b61a16f8dd1314b7d06d0bd4b1;hpb=fe29f9d25bb58b9d5c5581a2991d40358d2c8b31;p=elogind.git

diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index 1d448bd94..ff1f09177 100644
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -23,6 +23,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 #include <getopt.h>
+#include <locale.h>
 #include <string.h>
 #include <sys/timex.h>
 #include <sys/utsname.h>
@@ -62,6 +63,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) {
@@ -81,9 +83,11 @@ static void print_status_info(StatusInfo *i) {
                        strna(i->hostname));
 
         printf("   Pretty hostname: %s\n"
-               "         Icon name: %s\n",
+               "         Icon name: %s\n"
+               "           Chassis: %s\n",
                strna(i->pretty_hostname),
-               strna(i->icon_name));
+               strna(i->icon_name),
+               strna(i->chassis));
 
         r = sd_id128_get_machine(&mid);
         if (r >= 0)
@@ -132,6 +136,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;
         }
@@ -320,6 +326,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 = 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"
@@ -334,7 +362,8 @@ static int help(void) {
                "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;
@@ -377,7 +406,6 @@ static int parse_argv(int argc, char *argv[]) {
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
-                        puts(DISTRIBUTION);
                         puts(SYSTEMD_FEATURES);
                         return 0;
 
@@ -402,6 +430,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;
 
@@ -429,9 +461,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;
@@ -507,6 +540,7 @@ int main(int argc, char *argv[]) {
 
         dbus_error_init(&error);
 
+        setlocale(LC_ALL, "");
         log_parse_environment();
         log_open();