nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

system: Factorize (gnu system). 

* gnu/system.scm (operating-system-accounts,
  operating-system-etc-directory): New procedures.
  (operating-system-derivation): Use them.
* gnu/services/base.scm (%base-services): Add 'host-name-service'
  invocation.
This commit is contained in:
Ludovic Courtès 2014-04-23 15:47:42 +02:00
parent 42b001381e
commit 0b6f49ef69
2 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/services/base.scm
View File

@ -186,6 +186,9 @@ This is the GNU operating system, welcome!\n\n")))
(mingetty-service "tty6" #:motd motd)
(syslog-service)
(guix-service)
(nscd-service))))
(nscd-service)
;; FIXME: Make this an activation-time thing instead of a service.
(host-name-service "gnu"))))
;;; base.scm ends here

51
gnu/system.scm
View File

@ -292,22 +292,11 @@ alias ll='ls -l'
(mlet %store-monad ((drv (operating-system-profile-derivation os)))
(return (derivation->output-path drv))))
(define (operating-system-derivation os)
"Return a derivation that builds OS."
(mlet* %store-monad
((services (sequence %store-monad
(cons (host-name-service
(operating-system-host-name os))
(define (operating-system-accounts os)
"Return the user accounts for OS, including an obligatory 'root' account."
(mlet %store-monad ((services (sequence %store-monad
(operating-system-services os))))
(pam-services ->
;; Services known to PAM.
(delete-duplicates
(cons %pam-other-services
(append-map service-pam-services services))))
(bash-file (package-file bash "bin/bash"))
(dmd-file (package-file (@ (gnu packages admin) dmd) "bin/dmd"))
(accounts -> (cons (user-account
(return (cons (user-account
(name "root")
(password "")
(uid 0) (gid 0)
@ -315,18 +304,37 @@ alias ll='ls -l'
(home-directory "/root"))
(append (operating-system-users os)
(append-map service-user-accounts
services))))
(groups -> (append (operating-system-groups os)
(append-map service-user-groups services)))
services))))))
(define (operating-system-etc-directory os)
"Return that static part of the /etc directory of OS."
(mlet* %store-monad
((services (sequence %store-monad (operating-system-services os)))
(pam-services ->
;; Services known to PAM.
(delete-duplicates
(cons %pam-other-services
(append-map service-pam-services services))))
(accounts (operating-system-accounts os))
(profile-drv (operating-system-profile-derivation os))
(profile -> (derivation->output-path profile-drv))
(etc-drv (etc-directory #:accounts accounts #:groups groups
(groups -> (append (operating-system-groups os)
(append-map service-user-groups services))))
(etc-directory #:accounts accounts #:groups groups
#:pam-services pam-services
#:locale (operating-system-locale os)
#:timezone (operating-system-timezone os)
#:profile profile-drv))
#:profile profile-drv)))
(define (operating-system-derivation os)
"Return a derivation that builds OS."
(mlet* %store-monad
((bash-file (package-file bash "bin/bash"))
(dmd-file (package-file (@ (gnu packages admin) dmd) "bin/dmd"))
(profile-drv (operating-system-profile-derivation os))
(profile -> (derivation->output-path profile-drv))
(etc-drv (operating-system-etc-directory os))
(etc -> (derivation->output-path etc-drv))
(services (sequence %store-monad (operating-system-services os)))
(dmd-conf (dmd-configuration-file services etc))
@ -349,6 +357,7 @@ alias ll='ls -l'
,(string-append "--load=" boot)))
(initrd initrd-file))))
(grub.cfg (grub-configuration-file entries))
(accounts (operating-system-accounts os))
(extras (links (delete-duplicates
(append (append-map service-inputs services)
(append-map user-account-inputs accounts))))))