Merge branch 'ssh' into 'main'

some ssh related improvements

See merge request helmutg/debvm!14

2 files changed, 5 insertions, 1 deletions

diff --git a/debvm-create b/debvm-create
index 3e25578..58094cc 100755
--- a/debvm-create
+++ b/debvm-create
@@ -42,6 +42,7 @@ By default, the hostname is B<testvm>.
 Install the given ssh public key file into the virtual machine image for the root user.
 This option also causes the ssh server to be installed.
 By default, no key or server is installed.
+To connect to the vm, pass a port number to B<debvm-run> with the B<-s> option.
 
 =item B<-m> I<mirror>, B<--mirror>=I<mirror>
 
@@ -297,7 +298,7 @@ set -- \
 # add ssh key for root
 if test -n "$SSHKEY"; then
 	set -- \
-		'--customize-hook=mkdir -p "$1/root/.ssh"' \
+		'--customize-hook=mkdir -m700 -p "$1/root/.ssh"' \
 		"--customize-hook=upload $SSHKEY /root/.ssh/authorized_keys" \
 		"$@"
 fi
diff --git a/debvm-run b/debvm-run
index 1e1b3d8..9b64ef4 100755
--- a/debvm-run
+++ b/debvm-run
@@ -37,6 +37,9 @@ By default B<rootfs.ext4> in the working directory is used.
 =item B<-s> I<sshport>, B<--sshport>=I<sshport>
 
 If given, B<qemu> is configured to pass connections to I<127.0.0.1:sshport> to port 22 of the virtual machine.
+You can connect to your virtual machine without updating your known hosts like this:
+
+    ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p $sshport root@127.0.0.1
 
 =item B<--> I<qemu options>