vmspawn: split 'Integration' section into 'Logging' and 'SSH'

Each of the two has multiple options, hence let's split them out.

diff --git a/man/systemd-vmspawn.xml b/man/systemd-vmspawn.xml
index 2c07bad93c2dcd1841bfde173fb8b210160d1926..f31d1a3df273168b551d83b05dc90b4936a3c72f 100644 (file)
--- a/man/systemd-vmspawn.xml
+++ b/man/systemd-vmspawn.xml
@@ -708,7 +708,7 @@
     </refsect2>
 
     <refsect2>
-      <title>Integration Options</title>
+      <title>Logging Options</title>
 
       <variablelist>
         <varlistentry>
@@ -740,6 +740,13 @@
           <xi:include href="version-info.xml" xpointer="v261"/></listitem>
         </varlistentry>
 
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>SSH Options</title>
+
+      <variablelist>
         <varlistentry>
           <term><option>--pass-ssh-key=<replaceable>BOOL</replaceable></option></term>
 

diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index 4ced5d6896a76c352d188894867f8f83c363fc75..0c3c6a8109f1b178b1ce84150f47687353510ffb 100644 (file)
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -237,7 +237,8 @@ static int help(void) {
                 "Properties",
                 "User Namespacing",
                 "Mounts",
-                "Integration",
+                "Logging",
+                "SSH",
                 "Input/Output",
                 "Credentials",
         };
@@ -251,8 +252,10 @@ static int help(void) {
                         return r;
         }
 
-        (void) table_sync_column_widths(0, tables[0], tables[1], tables[2], tables[3], tables[4],
-                                        tables[5], tables[6], tables[7], tables[8], tables[9], tables[10]);
+        (void) table_sync_column_widths(
+                        0, tables[0], tables[1], tables[2], tables[3], tables[4],
+                        tables[5], tables[6], tables[7], tables[8], tables[9], tables[10],
+                        tables[11]);
 
         help_cmdline("[OPTIONS...] [ARGUMENTS...]");
         help_abstract("Spawn a command or OS in a virtual machine.");
@@ -839,7 +842,7 @@ static int parse_argv(int argc, char *argv[]) {
                                 return log_oom();
                         break;
 
-                OPTION_GROUP("Integration"): {}
+                OPTION_GROUP("Logging"): {}
 
                 OPTION_LONG("forward-journal", "FILE|DIR", "Forward the VM's journal to the host"):
                         r = parse_path_argument(opts.arg, /* suppress_root= */ false, &arg_forward_journal);
@@ -871,6 +874,8 @@ static int parse_argv(int argc, char *argv[]) {
                                 return log_error_errno(r, "Failed to parse --forward-journal-max-files= value: %s", opts.arg);
                         break;
 
+                OPTION_GROUP("SSH"): {}
+
                 OPTION_LONG("pass-ssh-key", "BOOL", "Create an SSH key to access the VM"):
                         r = parse_boolean_argument("--pass-ssh-key=", opts.arg, &arg_pass_ssh_key);
                         if (r < 0)