diff --git a/man/systemd-vmspawn.xml b/man/systemd-vmspawn.xml
index f31d1a3df2..c70b76c498 100644
--- a/man/systemd-vmspawn.xml
+++ b/man/systemd-vmspawn.xml
@@ -322,33 +322,6 @@
-
-
-
-
-
- Create a TAP device to network with the virtual machine.
-
- Note: root privileges are required to use TAP networking.
- Additionally,
- systemd-networkd8
- must be running and correctly set up on the host to provision the host interface. The relevant
- .network file can be found at
- /usr/lib/systemd/network/80-vm-vt.network.
-
-
-
-
-
-
-
-
-
- Use user mode networking.
-
-
-
-
@@ -454,6 +427,39 @@
+
+ Networking Options
+
+
+
+
+
+
+
+ Create a TAP device to network with the virtual machine.
+
+ Note: root privileges are required to use TAP networking.
+ Additionally,
+ systemd-networkd8
+ must be running and correctly set up on the host to provision the host interface. The relevant
+ .network file can be found at
+ /usr/lib/systemd/network/80-vm-vt.network.
+
+
+
+
+
+
+
+
+
+ Use user mode networking.
+
+
+
+
+
+
System Identity Options
diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index 0c3c6a8109..cc26309317 100644
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -232,6 +232,7 @@ static int help(void) {
NULL,
"Image",
"Host Configuration",
+ "Networking",
"Execution",
"System Identity",
"Properties",
@@ -255,7 +256,7 @@ static int help(void) {
(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]);
+ tables[11], tables[12]);
help_cmdline("[OPTIONS...] [ARGUMENTS...]");
help_abstract("Spawn a command or OS in a virtual machine.");
@@ -540,14 +541,6 @@ static int parse_argv(int argc, char *argv[]) {
break;
}
- OPTION('n', "network-tap", NULL, "Create a TAP device for networking"):
- arg_network_stack = NETWORK_STACK_TAP;
- break;
-
- OPTION_LONG("network-user-mode", NULL, "Use user mode networking"):
- arg_network_stack = NETWORK_STACK_USER;
- break;
-
OPTION_LONG("secure-boot", "BOOL|auto", "Enable searching for firmware supporting SecureBoot"): {
int b;
@@ -666,6 +659,16 @@ static int parse_argv(int argc, char *argv[]) {
break;
}
+ OPTION_GROUP("Networking"): {}
+
+ OPTION('n', "network-tap", NULL, "Create a TAP device for networking"):
+ arg_network_stack = NETWORK_STACK_TAP;
+ break;
+
+ OPTION_LONG("network-user-mode", NULL, "Use user mode networking"):
+ arg_network_stack = NETWORK_STACK_USER;
+ break;
+
OPTION_GROUP("Execution"): {}
OPTION('s', "smbios11", "STRING", "Pass an arbitrary SMBIOS Type #11 string to the VM"):