summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-09-12 22:35:12 +0200
committerLudovic Courtès <ludo@gnu.org>2017-09-12 23:56:34 +0200
commit960c40de21650368021b20c78b79101bce022b51 (patch)
treeaac0e819aa73bda583569d69f10304a67547c2d4
parent4e854b1814a9216ae7cc90aef4d82fd989a519c3 (diff)
downloadpatches-960c40de21650368021b20c78b79101bce022b51.tar
patches-960c40de21650368021b20c78b79101bce022b51.tar.gz
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.
-rw-r--r--doc/guix.texi5
-rw-r--r--gnu/system/examples/bare-bones.tmpl4
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index c5b277d027..0633691228 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 GNU@tie{}Screen 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 459d241885..7e0c8fbee0 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.