Merge branch main into helmut

Resolve conflicts in debvm-create arising from adding --skip and moving
the functionality to be skipped to share/customize-*.sh.

1 files changed, 18 insertions, 1 deletions

diff --git a/bin/debvm-run b/bin/debvm-run
index 4f7ff44..839653c 100755
--- a/bin/debvm-run
+++ b/bin/debvm-run
@@ -58,6 +58,23 @@ F<rootfs.ext4>, resulting in an ephemeral run.
 
     debvm-run -s 8022 -i rootfs.ext4 -- -snapshot
 
+=head1 FAQ
+
+=over 8
+
+=item The debvm-run console renders wrong.
+
+Get C<echo $LINES $COLUMNS> from an other terminal and run C<stty rows $LINES cols $COLUMNS> in the console or use ssh.
+Another option is to run C<eval $(resize)>, which is available from the B<xterm> package.
+Also set C<$TERM> to the outside value.
+
+=item How can I kill debvm-run?
+
+The wrapped B<qemu> can be terminated by pressing Ctrl-a x.
+Refer to the B<qemu> manual page for more escape sequences.
+
+=back
+
 =head1 LIMITATIONS
 
 Due to the way kernel and bootloader are being extracted before running B<qemu>, one cannot upgrade a kernel and then just reboot.
@@ -132,7 +149,7 @@ while getopts :gi:s:-: OPTCHAR; do
 			usage_error "missing argument for -$OPTARG"
 		;;
 		'?')
-			usage_erro "unrecognized option -$OPTARG"
+			usage_error "unrecognized option -$OPTARG"
 		;;
 		*)
 			die "internal error while parsing command options, please report a bug"