04/05: doc: Use Screen and OpenSSH in the bare-bones example.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 960c40de21650368021b20c78b79101bce022b51
Author: Ludovic Courtès <address@hidden>
Date:   Tue Sep 12 22:35:12 2017 +0200

    doc: Use Screen and OpenSSH in the bare-bones example.
    
    * gnu/system/examples/bare-bones.tmpl (packages): Remove TCPDUMP; add
    SCREEN and OPENSSH.
    * doc/guix.texi (Using the Configuration System): Adjust explanation
    accordingly.
---
 doc/guix.texi                       | 5 +++--
 gnu/system/examples/bare-bones.tmpl | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index c5b277d..0633691 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -8186,8 +8186,9 @@ environment variable---in addition to the per-user 
profiles
 provides all the tools one would expect for basic user and administrator
 tasks---including the GNU Core Utilities, the GNU Networking Utilities,
 the GNU Zile lightweight text editor, @command{find}, @command{grep},
-etc.  The example above adds tcpdump to those, taken from the @code{(gnu
-packages admin)} module (@pxref{Package Modules}).  The
+etc.  The example above adds address@hidden and OpenSSH to those,
+taken from the @code{(gnu packages screen)} and @code{(gnu packages ssh)}
+modules (@pxref{Package Modules}).  The
 @code{(list package output)} syntax can be used to add a specific output
 of a package:
 
diff --git a/gnu/system/examples/bare-bones.tmpl 
b/gnu/system/examples/bare-bones.tmpl
index 459d241..7e0c8fb 100644
--- a/gnu/system/examples/bare-bones.tmpl
+++ b/gnu/system/examples/bare-bones.tmpl
@@ -3,7 +3,7 @@
 
 (use-modules (gnu))
 (use-service-modules networking ssh)
-(use-package-modules admin)
+(use-package-modules screen ssh)
 
 (operating-system
   (host-name "komputilo")
@@ -40,7 +40,7 @@
                %base-user-accounts))
 
   ;; Globally-installed packages.
-  (packages (cons tcpdump %base-packages))
+  (packages (cons* screen openssh %base-packages))
 
   ;; Add services to the baseline: a DHCP client and
   ;; an SSH server.