~ruther/guix-local

54d6223d2c240c0214c123e0b0aa977a01a3c209 — Ludovic Courtès 11 years ago 6f05630
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.
4 files changed, 4 insertions(+), 4 deletions(-)

M Makefile.am
M doc.am
R gnu/system/{os-config => examples/bare-bones}.tmpl
M gnu/system/install.scm
M Makefile.am => Makefile.am +1 -1
@@ 135,7 135,7 @@ KCONFIGS =					\

# Templates, examples.
EXAMPLES =					\
  gnu/system/os-config.tmpl
  gnu/system/examples/bare-bones.tmpl

GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go


M doc.am => doc.am +2 -2
@@ 1,5 1,5 @@
# 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>
#
# This file is part of GNU Guix.


@@ 30,7 30,7 @@ BUILT_SOURCES        += doc/os-config.texi
EXTRA_DIST           += 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 "$@"`"
	cp "$<" "$@"


R gnu/system/os-config.tmpl => gnu/system/examples/bare-bones.tmpl +0 -0
M gnu/system/install.scm => gnu/system/install.scm +1 -1
@@ 175,7 175,7 @@ configuration template file in the installation system."
  (define local-template
    "/etc/configuration-template.scm")
  (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)))
    (return (service