diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-02-19 21:08:28 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-19 21:08:28 +0100 |
| commit | 8b198abecde8c846eaa464ac1b41cbc18556b5e8 (patch) | |
| tree | 738bd9834c4ac6e7717ab793a0e62efdfc18d701 /gnu | |
| parent | db4fdc04cc05495788ee54ae25baf8cd056917dc (diff) | |
| download | patches-8b198abecde8c846eaa464ac1b41cbc18556b5e8.tar patches-8b198abecde8c846eaa464ac1b41cbc18556b5e8.tar.gz | |
gnu: Define '%base-services'.
* gnu/services/base.scm (%base-services): New variable.
* gnu/system.scm (<operating-system>)[services]: Change the default
value to %BASE-SERVICES.
* doc/guix.texi (Using the Configuration System): Change
'%standard-services' to '%base-services'.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/services/base.scm | 17 | ||||
| -rw-r--r-- | gnu/system.scm | 20 |
2 files changed, 17 insertions, 20 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 3d684a5bec..d6c1707c6a 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -32,7 +32,8 @@ mingetty-service nscd-service syslog-service - guix-service)) + guix-service + %base-services)) ;;; Commentary: ;;; @@ -173,4 +174,18 @@ BUILD-ACCOUNTS user accounts available under BUILD-USER-GID." (members (map user-account-name user-accounts))))))))) +(define %base-services + ;; Convenience variable holding the basic services. + (let ((motd (text-file "motd" " +This is the GNU operating system, welcome!\n\n"))) + (list (mingetty-service "tty1" #:motd motd) + (mingetty-service "tty2" #:motd motd) + (mingetty-service "tty3" #:motd motd) + (mingetty-service "tty4" #:motd motd) + (mingetty-service "tty5" #:motd motd) + (mingetty-service "tty6" #:motd motd) + (syslog-service) + (guix-service) + (nscd-service)))) + ;;; base.scm ends here diff --git a/gnu/system.scm b/gnu/system.scm index f05b7a092a..e6346106a2 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -29,8 +29,6 @@ #:use-module (gnu services) #:use-module (gnu services dmd) #:use-module (gnu services base) - #:use-module ((gnu services networking) - #:select (static-networking-service)) #:use-module (gnu system grub) #:use-module (gnu system shadow) #:use-module (gnu system linux) @@ -107,23 +105,7 @@ (locale operating-system-locale) ; string (services operating-system-services ; list of monadic services - (default - (let ((motd (text-file "motd" " -This is the GNU operating system, welcome!\n\n"))) - (list (mingetty-service "tty1" #:motd motd) - (mingetty-service "tty2" #:motd motd) - (mingetty-service "tty3" #:motd motd) - (mingetty-service "tty4" #:motd motd) - (mingetty-service "tty5" #:motd motd) - (mingetty-service "tty6" #:motd motd) - (syslog-service) - (guix-service) - (nscd-service) - - ;; QEMU networking settings. - (static-networking-service "eth0" "10.0.2.10" - #:name-servers '("10.0.2.3") - #:gateway "10.0.2.2")))))) + (default %base-services))) |