civodul pushed a commit to branch master
in repository guix.
commit 54d6223d2c240c0214c123e0b0aa977a01a3c209
Author: Ludovic Courtès <l...@gnu.org>
Date: Sat May 9 16:41:38 2015 +0200
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.
---
Makefile.am | 2 +-
doc.am | 4 ++--
.../{os-config.tmpl => examples/bare-bones.tmpl} | 0
gnu/system/install.scm | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 4fc1fc2..b20421a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/doc.am b/doc.am
index 56ad114..c517e0f 100644
--- a/doc.am
+++ b/doc.am
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014 Ludovic Courtès <l...@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <l...@gnu.org>
# Copyright © 2013 Andreas Enge <andr...@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 "$<" "$@"
diff --git a/gnu/system/os-config.tmpl b/gnu/system/examples/bare-bones.tmpl
similarity index 100%
rename from gnu/system/os-config.tmpl
rename to gnu/system/examples/bare-bones.tmpl
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index d55f0a0..bba2df5 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -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
