nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

doc: Rename OS config example. 

* gnu/system/os-config.tmpl: Rename to...
* gnu/system/examples/bare-bones.tmpl: ... this.
* Makefile.am (EXAMPLES): Adjust accordingly.
* doc.am (doc/os-config.texi): Likewise.
* gnu/system/install.scm (configuration-template-service)[template]:
  Likewise.
This commit is contained in:
Ludovic Courtès 2015-05-09 16:41:38 +02:00
parent 6f05630ba6
commit 54d6223d2c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -135,7 +135,7 @@ KCONFIGS = \
# Templates, examples. # Templates, examples.
EXAMPLES = \ EXAMPLES = \
gnu/system/os-config.tmpl gnu/system/examples/bare-bones.tmpl
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go

4
doc.am
View File

@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU # GNU Guix --- Functional package management for GNU
# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> # Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013 Andreas Enge <andreas@enge.fr> # Copyright © 2013 Andreas Enge <andreas@enge.fr>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
@ -30,7 +30,7 @@ BUILT_SOURCES += doc/os-config.texi
EXTRA_DIST += doc/os-config.texi EXTRA_DIST += doc/os-config.texi
MAINTAINERCLEANFILES = doc/os-config.texi MAINTAINERCLEANFILES = doc/os-config.texi
doc/os-config.texi: gnu/system/os-config.tmpl doc/os-config.texi: gnu/system/examples/bare-bones.tmpl
$(MKDIR_P) "`dirname "$@"`" $(MKDIR_P) "`dirname "$@"`"
cp "$<" "$@" cp "$<" "$@"

0
gnu/system/os-config.tmpl → gnu/system/examples/bare-bones.tmpl
View File

2
gnu/system/install.scm
View File

@ -175,7 +175,7 @@ configuration template file in the installation system."
(define local-template (define local-template
"/etc/configuration-template.scm") "/etc/configuration-template.scm")
(define template (define template
(search-path %load-path "gnu/system/os-config.tmpl")) (search-path %load-path "gnu/system/examples/bare-bones.tmpl"))
(mlet %store-monad ((template (interned-file template))) (mlet %store-monad ((template (interned-file template)))
(return (service (return (service