[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/07: doc: Update bit about SSH in the VM.
From: |
guix-commits |
Subject: |
03/07: doc: Update bit about SSH in the VM. |
Date: |
Sat, 27 Apr 2019 09:08:28 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit ea2acfe98a3f3c00d15caa3e899ccbd126b97eb6
Author: Ludovic Courtès <address@hidden>
Date: Sat Apr 27 10:15:34 2019 +0200
doc: Update bit about SSH in the VM.
* doc/guix.texi (Running Guix in a VM): Remove mentions of 'lsh-server';
mention 'openssh-service-type' and add a cross-reference.
* gnu/system/examples/vm-image.tmpl (services): Add a commented-out line
for 'openssh-service-type'.
---
doc/guix.texi | 9 ++++-----
gnu/system/examples/vm-image.tmpl | 5 ++++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index de30743..ddd20af 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -24703,11 +24703,10 @@ network connectivity, for example @command{guix
download}.
@cindex SSH
@cindex SSH server
-To enable SSH inside a VM you need to add a SSH server like
@code{(dropbear-service)}
-or @code{(lsh-service)} to your VM. The @code{(lsh-service}) doesn't currently
-boot unsupervised. It requires you to type some characters to initialize the
-randomness generator. In addition you need to forward the SSH port, 22 by
-default, to the host. You can do this with
+To enable SSH inside a VM you need to add an SSH server like
address@hidden to your VM (@pxref{Networking Services,
address@hidden). In addition you need to forward the SSH port,
+22 by default, to the host. You can do this with
@example
`guix system vm config.scm` -net user,hostfwd=tcp::10022-:22
diff --git a/gnu/system/examples/vm-image.tmpl
b/gnu/system/examples/vm-image.tmpl
index b6f9daa..9bc08fa 100644
--- a/gnu/system/examples/vm-image.tmpl
+++ b/gnu/system/examples/vm-image.tmpl
@@ -5,7 +5,7 @@
;;
(use-modules (gnu) (srfi srfi-1))
-(use-service-modules desktop networking xorg)
+(use-service-modules desktop networking ssh xorg)
(use-package-modules bootloaders nvi wget xorg)
(define vm-image-motd (plain-file "motd" "
@@ -73,6 +73,9 @@ accounts.\x1b[0m
(xorg-configuration
(keyboard-layout keyboard-layout)))))
+ ;; Uncomment the line below to add an SSH server.
+ ;;(service openssh-service-type)
+
;; Use the DHCP client service rather than NetworkManager.
(service dhcp-client-service-type))
- branch master updated (6cd7b1b -> 6e0521e), guix-commits, 2019/04/27
- 01/07: maint: Pass '--image-size=30G' to 'guix system vm-image'., guix-commits, 2019/04/27
- 02/07: doc: Recommend virtio-blk to access the VM image., guix-commits, 2019/04/27
- 05/07: vm-image: Mention 'info guix' in the MOTD., guix-commits, 2019/04/27
- 04/07: vm-image: Add a font to the global profile., guix-commits, 2019/04/27
- 03/07: doc: Update bit about SSH in the VM.,
guix-commits <=
- 07/07: vm-image: Allow for password-less sudo., guix-commits, 2019/04/27
- 06/07: doc: Suggest 1G of RAM for the VM image., guix-commits, 2019/04/27