diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-04-27 10:15:34 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-04-27 15:08:17 +0200 |
| commit | ea2acfe98a3f3c00d15caa3e899ccbd126b97eb6 (patch) | |
| tree | defdebac881f95bf7e728cbf91dc122acb8e2222 | |
| parent | 05b60752a67af294c35d8f4218487c9a44b5fdee (diff) | |
| download | patches-ea2acfe98a3f3c00d15caa3e899ccbd126b97eb6.tar patches-ea2acfe98a3f3c00d15caa3e899ccbd126b97eb6.tar.gz | |
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'.
| -rw-r--r-- | doc/guix.texi | 9 | ||||
| -rw-r--r-- | 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 de30743d58..ddd20af256 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 +@code{openssh-service-type} to your VM (@pxref{Networking Services, +@code{openssh-service-type}}). 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 b6f9daaf61..9bc08fa635 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)) |