X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmachine%2Fmachinectl.c;h=32f862d093441b93978c41401c68e2f1be6ad595;hb=a6278b88305b237b02eabff0d870b57fe851822d;hp=3f4f8acb7e2c861aed121cd98d5a480602b843cd;hpb=923d8fd381bced1c2d90ca53d18629d61a0f454a;p=elogind.git

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 3f4f8acb7..32f862d09 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -46,9 +46,9 @@ static char **arg_property = NULL;
 static bool arg_all = false;
 static bool arg_full = false;
 static bool arg_no_pager = false;
+static bool arg_legend = true;
 static const char *arg_kill_who = NULL;
 static int arg_signal = SIGTERM;
-static bool arg_ask_password = true;
 static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
 static char *arg_host = NULL;
 
@@ -84,7 +84,8 @@ static int list_machines(sd_bus *bus, char **args, unsigned n) {
                 return r;
         }
 
-        printf("%-32s %-9s %-16s\n", "MACHINE", "CONTAINER", "SERVICE");
+        if (arg_legend)
+                printf("%-32s %-9s %-16s\n", "MACHINE", "CONTAINER", "SERVICE");
 
         r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssso)");
         if (r < 0)
@@ -102,7 +103,8 @@ static int list_machines(sd_bus *bus, char **args, unsigned n) {
         if (r < 0)
                 return bus_log_parse_error(r);
 
-        printf("\n%u machines listed.\n", k);
+        if (arg_legend)
+                printf("\n%u machines listed.\n", k);
 
         return 0;
 }
@@ -618,7 +620,7 @@ static int login_machine(sd_bus *bus, char **args, unsigned n) {
                 return -EIO;
         }
 
-        r = sd_bus_open_system_container(args[1], &container_bus);
+        r = sd_bus_open_system_container(&container_bus, args[1]);
         if (r < 0) {
                 log_error("Failed to get container bus: %s", strerror(-r));
                 return r;
@@ -673,7 +675,7 @@ static int help(void) {
                "  -h --help              Show this help\n"
                "     --version           Show package version\n"
                "     --no-pager          Do not pipe output into a pager\n"
-               "     --no-ask-password   Don't prompt for password\n"
+               "     --no-legend         Do not show the headers and footers\n"
                "  -H --host=[USER@]HOST  Operate on remote host\n"
                "  -M --machine=CONTAINER Operate on local container\n"
                "  -p --property=NAME     Show only properties by this name\n"
@@ -699,8 +701,8 @@ static int parse_argv(int argc, char *argv[]) {
         enum {
                 ARG_VERSION = 0x100,
                 ARG_NO_PAGER,
+                ARG_NO_LEGEND,
                 ARG_KILL_WHO,
-                ARG_NO_ASK_PASSWORD,
         };
 
         static const struct option options[] = {
@@ -710,11 +712,11 @@ static int parse_argv(int argc, char *argv[]) {
                 { "all",             no_argument,       NULL, 'a'                 },
                 { "full",            no_argument,       NULL, 'l'                 },
                 { "no-pager",        no_argument,       NULL, ARG_NO_PAGER        },
+                { "no-legend",       no_argument,       NULL, ARG_NO_LEGEND       },
                 { "kill-who",        required_argument, NULL, ARG_KILL_WHO        },
                 { "signal",          required_argument, NULL, 's'                 },
                 { "host",            required_argument, NULL, 'H'                 },
                 { "machine",         required_argument, NULL, 'M'                 },
-                { "no-ask-password", no_argument,       NULL, ARG_NO_ASK_PASSWORD },
                 {}
         };
 
@@ -758,8 +760,8 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_no_pager = true;
                         break;
 
-                case ARG_NO_ASK_PASSWORD:
-                        arg_ask_password = false;
+                case ARG_NO_LEGEND:
+                        arg_legend = false;
                         break;
 
                 case ARG_KILL_WHO: