From 54d6223d2c240c0214c123e0b0aa977a01a3c209 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 9 May 2015 16:41:38 +0200
Subject: 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.
---
 gnu/system/examples/bare-bones.tmpl | 47 +++++++++++++++++++++++++++++++++++++
 gnu/system/install.scm              |  2 +-
 gnu/system/os-config.tmpl           | 47 -------------------------------------
 3 files changed, 48 insertions(+), 48 deletions(-)
 create mode 100644 gnu/system/examples/bare-bones.tmpl
 delete mode 100644 gnu/system/os-config.tmpl

(limited to 'gnu')

diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl
new file mode 100644
index 0000000000..e14c95733a
--- /dev/null
+++ b/gnu/system/examples/bare-bones.tmpl
@@ -0,0 +1,47 @@
+;; This is an operating system configuration template.
+
+(use-modules (gnu))
+(use-service-modules xorg networking dbus avahi)
+(use-package-modules xorg avahi)
+
+(operating-system
+  (host-name "antelope")
+  (timezone "Europe/Paris")
+  (locale "en_US.UTF-8")
+
+  ;; Assuming /dev/sdX is the target hard disk, and "root" is
+  ;; the label of the target root file system.
+  (bootloader (grub-configuration (device "/dev/sdX")))
+  (file-systems (cons (file-system
+                        (device "root")
+                        (title 'label)
+                        (mount-point "/")
+                        (type "ext4"))
+                      %base-file-systems))
+
+  ;; This is where user accounts are specified.  The "root"
+  ;; account is implicit, and is initially created with the
+  ;; empty password.
+  (users (list (user-account
+                (name "alice")
+                (comment "Bob's sister")
+                (group "users")
+
+                ;; Adding the account to the "wheel" group
+                ;; makes it a sudoer.  Adding it to "audio"
+                ;; and "video" allows the user to play sound
+                ;; and access the webcam.
+                (supplementary-groups '("wheel"
+                                        "audio" "video"))
+                (home-directory "/home/alice"))))
+
+  ;; Globally-installed packages.
+  (packages (cons xterm %base-packages))
+
+  ;; Add services to the baseline: the SLiM log-in manager
+  ;; for Xorg sessions, a DHCP client, Avahi, and D-Bus.
+  (services (cons* (slim-service)
+                   (dhcp-client-service)
+                   (avahi-service)
+                   (dbus-service (list avahi))
+                   %base-services)))
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index d55f0a0978..bba2df5094 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
diff --git a/gnu/system/os-config.tmpl b/gnu/system/os-config.tmpl
deleted file mode 100644
index e14c95733a..0000000000
--- a/gnu/system/os-config.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-;; This is an operating system configuration template.
-
-(use-modules (gnu))
-(use-service-modules xorg networking dbus avahi)
-(use-package-modules xorg avahi)
-
-(operating-system
-  (host-name "antelope")
-  (timezone "Europe/Paris")
-  (locale "en_US.UTF-8")
-
-  ;; Assuming /dev/sdX is the target hard disk, and "root" is
-  ;; the label of the target root file system.
-  (bootloader (grub-configuration (device "/dev/sdX")))
-  (file-systems (cons (file-system
-                        (device "root")
-                        (title 'label)
-                        (mount-point "/")
-                        (type "ext4"))
-                      %base-file-systems))
-
-  ;; This is where user accounts are specified.  The "root"
-  ;; account is implicit, and is initially created with the
-  ;; empty password.
-  (users (list (user-account
-                (name "alice")
-                (comment "Bob's sister")
-                (group "users")
-
-                ;; Adding the account to the "wheel" group
-                ;; makes it a sudoer.  Adding it to "audio"
-                ;; and "video" allows the user to play sound
-                ;; and access the webcam.
-                (supplementary-groups '("wheel"
-                                        "audio" "video"))
-                (home-directory "/home/alice"))))
-
-  ;; Globally-installed packages.
-  (packages (cons xterm %base-packages))
-
-  ;; Add services to the baseline: the SLiM log-in manager
-  ;; for Xorg sessions, a DHCP client, Avahi, and D-Bus.
-  (services (cons* (slim-service)
-                   (dhcp-client-service)
-                   (avahi-service)
-                   (dbus-service (list avahi))
-                   %base-services)))
-- 
cgit v1.2.3