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:
		
							parent
							
								
									6f05630ba6
								
							
						
					
					
						commit
						54d6223d2c
					
				
					 4 changed files with 4 additions and 4 deletions
				
			
		|  | @ -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 | ||||
| 
 | ||||
|  |  | |||
							
								
								
									
										4
									
								
								doc.am
									
										
									
									
									
								
							
							
						
						
									
										4
									
								
								doc.am
									
										
									
									
									
								
							|  | @ -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 "$<" "$@" | ||||
| 
 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
		Reference in a new issue