X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/0b6f49ef69b4429e05f6e76ccd2ee9e1d07e7776..94e3029a834cb53a60dcef18556f8d207dea85cd:/gnu/system.scm

diff --git a/gnu/system.scm b/gnu/system.scm
index 0c330f1564..65d1ca3418 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -19,6 +19,7 @@
 (define-module (gnu system)
   #:use-module (guix store)
   #:use-module (guix monads)
+  #:use-module (guix gexp)
   #:use-module (guix records)
   #:use-module (guix packages)
   #:use-module (guix derivations)
@@ -50,9 +51,20 @@
             operating-system-timezone
             operating-system-locale
             operating-system-services
+            operating-system-file-systems
 
-            operating-system-profile-directory
-            operating-system-derivation))
+            operating-system-derivation
+            operating-system-profile
+
+            <file-system>
+            file-system
+            file-system?
+            file-system-device
+            file-system-mount-point
+            file-system-type
+            file-system-needed-for-boot?
+            file-system-flags
+            file-system-options))
 
 ;;; Commentary:
 ;;;
@@ -71,8 +83,8 @@
               (default grub))
   (bootloader-entries operating-system-bootloader-entries ; list
                       (default '()))
-  (initrd operating-system-initrd                 ; monadic derivation
-          (default (gnu-system-initrd)))
+  (initrd operating-system-initrd                 ; (list fs) -> M derivation
+          (default qemu-initrd))
 
   (host-name operating-system-host-name)          ; string
 
@@ -84,11 +96,7 @@
   (groups operating-system-groups                 ; list of user groups
           (default (list (user-group
                           (name "root")
-                          (id 0))
-                         (user-group
-                          (name "users")
-                          (id 100)
-                          (members '("guest"))))))
+                          (id 0)))))
 
   (packages operating-system-packages             ; list of (PACKAGE OUTPUT...)
             (default (list coreutils              ; or just PACKAGE
@@ -105,8 +113,31 @@
   (locale   operating-system-locale)              ; string
 
   (services operating-system-services             ; list of monadic services
-            (default %base-services)))
-
+            (default %base-services))
+
+  (pam-services operating-system-pam-services     ; list of PAM services
+                (default (base-pam-services)))
+  (setuid-programs operating-system-setuid-programs
+                   (default %setuid-programs))    ; list of string-valued gexps
+
+  (sudoers operating-system-sudoers               ; /etc/sudoers contents
+           (default %sudoers-specification)))
+
+;; File system declaration.
+(define-record-type* <file-system> file-system
+  make-file-system
+  file-system?
+  (device           file-system-device)           ; string
+  (mount-point      file-system-mount-point)      ; string
+  (type             file-system-type)             ; string
+  (flags            file-system-flags             ; list of symbols
+                    (default '()))
+  (options          file-system-options           ; string or #f
+                    (default #f))
+  (needed-for-boot? file-system-needed-for-boot?  ; Boolean
+                    (default #f))
+  (check?           file-system-check?            ; Boolean
+                    (default #t)))
 
 
 ;;;
@@ -119,116 +150,54 @@
   "Return a derivation that builds the union of INPUTS.  INPUTS is a list of
 input tuples."
   (define builder
-    '(begin
-       (use-modules (guix build union))
-
-       (setvbuf (current-output-port) _IOLBF)
-       (setvbuf (current-error-port) _IOLBF)
-
-       (let ((output (assoc-ref %outputs "out"))
-             (inputs (map cdr %build-inputs)))
-         (format #t "building union `~a' with ~a packages...~%"
-                 output (length inputs))
-         (union-build output inputs))))
-
-  (mlet %store-monad
-      ((inputs (sequence %store-monad
-                         (map (match-lambda
-                               ((or ((? package? p)) (? package? p))
-                                (mlet %store-monad
-                                    ((drv (package->derivation p system)))
-                                  (return `(,name ,drv))))
-                               (((? package? p) output)
-                                (mlet %store-monad
-                                    ((drv (package->derivation p system)))
-                                  (return `(,name ,drv ,output))))
-                               (x
-                                (return x)))
-                              inputs))))
-    (derivation-expression name builder
-                           #:system system
-                           #:inputs inputs
-                           #:modules '((guix build union))
-                           #:guile-for-build guile
-                           #:local-build? #t)))
-
-(define* (file-union files
-                     #:key (inputs '()) (name "file-union"))
+    #~(begin
+        (use-modules (guix build union))
+
+        (define inputs '#$inputs)
+
+        (setvbuf (current-output-port) _IOLBF)
+        (setvbuf (current-error-port) _IOLBF)
+
+        (format #t "building union `~a' with ~a packages...~%"
+                #$output (length inputs))
+        (union-build #$output inputs)))
+
+  (gexp->derivation name builder
+                    #:system system
+                    #:modules '((guix build union))
+                    #:guile-for-build guile
+                    #:local-build? #t))
+
+(define* (file-union name files)
   "Return a derivation that builds a directory containing all of FILES.  Each
 item in FILES must be a list where the first element is the file name to use
-in the new directory, and the second element is the target file.
-
-The subset of FILES corresponding to plain store files is automatically added
-as an inputs; additional inputs, such as derivations, are taken from INPUTS."
-  (mlet %store-monad ((inputs (lower-inputs inputs)))
-    (let* ((outputs (append-map (match-lambda
-                                 ((_ (? derivation? drv))
-                                  (list (derivation->output-path drv)))
-                                 ((_ (? derivation? drv) sub-drv ...)
-                                  (map (cut derivation->output-path drv <>)
-                                       sub-drv))
-                                 (_ '()))
-                                inputs))
-           (inputs   (append inputs
-                             (filter (match-lambda
-                                      ((_ file)
-                                       ;; Elements of FILES that are store
-                                       ;; files and that do not correspond to
-                                       ;; the output of INPUTS are considered
-                                       ;; inputs (still here?).
-                                       (and (direct-store-path? file)
-                                            (not (member file outputs)))))
-                                     files))))
-      (derivation-expression name
-                             `(let ((out (assoc-ref %outputs "out")))
-                                (mkdir out)
-                                (chdir out)
-                                ,@(map (match-lambda
-                                        ((name target)
-                                         `(symlink ,target ,name)))
-                                       files))
-
-                             #:inputs inputs
-                             #:local-build? #t))))
-
-(define (links inputs)
-  "Return a directory with symbolic links to all of INPUTS.  This is
-essentially useful when one wants to keep references to all of INPUTS, be they
-directories or regular files."
+in the new directory, and the second element is a gexp denoting the target
+file."
   (define builder
-    '(begin
-       (use-modules (srfi srfi-1))
-
-       (let ((out (assoc-ref %outputs "out")))
-         (mkdir out)
-         (chdir out)
-         (fold (lambda (file number)
-                 (symlink file (number->string number))
-                 (+ 1 number))
-               0
-               (map cdr %build-inputs))
-         #t)))
-
-  (mlet %store-monad ((inputs (lower-inputs inputs)))
-    (derivation-expression "links" builder
-                           #:inputs inputs
-                           #:local-build? #t)))
+    #~(begin
+        (mkdir #$output)
+        (chdir #$output)
+        #$@(map (match-lambda
+                 ((target source)
+                  #~(symlink #$source #$target)))
+                files)))
+
+  (gexp->derivation name builder))
 
 (define* (etc-directory #:key
                         (locale "C") (timezone "Europe/Paris")
                         (accounts '())
                         (groups '())
                         (pam-services '())
-                        (profile "/var/run/current-system/profile"))
+                        (profile "/var/run/current-system/profile")
+                        (sudoers ""))
   "Return a derivation that builds the static part of the /etc directory."
   (mlet* %store-monad
-      ((services   (package-file net-base "etc/services"))
-       (protocols  (package-file net-base "etc/protocols"))
-       (rpc        (package-file net-base "etc/rpc"))
-       (passwd     (passwd-file accounts))
+      ((passwd     (passwd-file accounts))
        (shadow     (passwd-file accounts #:shadow? #t))
        (group      (group-file groups))
        (pam.d      (pam-services->directory pam-services))
+       (sudoers    (text-file "sudoers" sudoers))
        (login.defs (text-file "login.defs" "# Empty for now.\n"))
        (shells     (text-file "shells"            ; used by xterm and others
                               "\
@@ -254,44 +223,35 @@ export TZ=\"" timezone "\"
 export TZDIR=\"" tzdata "/share/zoneinfo\"
 
 export PATH=$HOME/.guix-profile/bin:" profile "/bin:" profile "/sbin
+export PATH=/run/setuid-programs:$PATH
 export CPATH=$HOME/.guix-profile/include:" profile "/include
 export LIBRARY_PATH=$HOME/.guix-profile/lib:" profile "/lib
 alias ls='ls -p --color'
 alias ll='ls -l'
-"))
-
-       (tz-file  (package-file tzdata
-                               (string-append "share/zoneinfo/" timezone)))
-       (files -> `(("services" ,services)
-                   ("protocols" ,protocols)
-                   ("rpc" ,rpc)
-                   ("pam.d" ,(derivation->output-path pam.d))
-                   ("login.defs" ,login.defs)
-                   ("issue" ,issue)
-                   ("shells" ,shells)
-                   ("profile" ,(derivation->output-path bashrc))
-                   ("localtime" ,tz-file)
-                   ("passwd" ,passwd)
-                   ("shadow" ,shadow)
-                   ("group" ,group))))
-    (file-union files
-                #:inputs `(("net" ,net-base)
-                           ("pam.d" ,pam.d)
-                           ("bashrc" ,bashrc)
-                           ("tzdata" ,tzdata))
-                #:name "etc")))
-
-(define (operating-system-profile-derivation os)
+")))
+    (file-union "etc"
+                `(("services" ,#~(string-append #$net-base "/etc/services"))
+                  ("protocols" ,#~(string-append #$net-base "/etc/protocols"))
+                  ("rpc" ,#~(string-append #$net-base "/etc/rpc"))
+                  ("pam.d" ,#~#$pam.d)
+                  ("login.defs" ,#~#$login.defs)
+                  ("issue" ,#~#$issue)
+                  ("shells" ,#~#$shells)
+                  ("profile" ,#~#$bashrc)
+                  ("localtime" ,#~(string-append #$tzdata "/share/zoneinfo/"
+                                                 #$timezone))
+                  ("passwd" ,#~#$passwd)
+                  ("shadow" ,#~#$shadow)
+                  ("group" ,#~#$group)
+
+                  ("sudoers" ,#~#$sudoers)))))
+
+(define (operating-system-profile os)
   "Return a derivation that builds the default profile of OS."
   ;; TODO: Replace with a real profile with a manifest.
   (union (operating-system-packages os)
          #:name "default-profile"))
 
-(define (operating-system-profile-directory os)
-  "Return the directory name of the default profile of OS."
-  (mlet %store-monad ((drv (operating-system-profile-derivation os)))
-    (return (derivation->output-path drv))))
-
 (define (operating-system-accounts os)
   "Return the user accounts for OS, including an obligatory 'root' account."
   (mlet %store-monad ((services (sequence %store-monad
@@ -313,68 +273,115 @@ alias ll='ls -l'
        (pam-services ->
                      ;; Services known to PAM.
                      (delete-duplicates
-                      (cons %pam-other-services
-                            (append-map service-pam-services services))))
+                      (append (operating-system-pam-services os)
+                              (append-map service-pam-services services))))
        (accounts    (operating-system-accounts os))
-       (profile-drv (operating-system-profile-derivation os))
+       (profile-drv (operating-system-profile os))
        (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)
+                  #:sudoers (operating-system-sudoers os)
                   #:profile profile-drv)))
 
+(define %setuid-programs
+  ;; Default set of setuid-root programs.
+  (let ((shadow (@ (gnu packages admin) shadow)))
+    (list #~(string-append #$shadow "/bin/passwd")
+          #~(string-append #$shadow "/bin/su")
+          #~(string-append #$inetutils "/bin/ping")
+          #~(string-append #$sudo "/bin/sudo"))))
+
+(define %sudoers-specification
+  ;; Default /etc/sudoers contents: 'root' and all members of the 'wheel'
+  ;; group can do anything.  See
+  ;; <http://www.sudo.ws/sudo/man/1.8.10/sudoers.man.html>.
+  ;; TODO: Add a declarative API.
+  "root ALL=(ALL) ALL
+%wheel ALL=(ALL) ALL\n")
+
+(define (operating-system-boot-script os)
+  "Return the boot script for OS---i.e., the code started by the initrd once
+we're running in the final root."
+  (define %modules
+    '((guix build activation)
+      (guix build utils)))
+
+  (mlet* %store-monad
+      ((services (sequence %store-monad (operating-system-services os)))
+       (etc      (operating-system-etc-directory os))
+       (modules  (imported-modules %modules))
+       (compiled (compiled-modules %modules))
+       (dmd-conf (dmd-configuration-file services)))
+    (define setuid-progs
+      (operating-system-setuid-programs os))
+
+    (gexp->file "boot"
+                #~(begin
+                    (eval-when (expand load eval)
+                      ;; Make sure 'use-modules' below succeeds.
+                      (set! %load-path (cons #$modules %load-path))
+                      (set! %load-compiled-path
+                            (cons #$compiled %load-compiled-path)))
+
+                    (use-modules (guix build activation))
+
+                    ;; Populate /etc.
+                    (activate-etc #$etc)
+
+                    ;; Activate setuid programs.
+                    (activate-setuid-programs (list #$@setuid-progs))
+
+                    ;; Start dmd.
+                    (execl (string-append #$dmd "/bin/dmd")
+                           "dmd" "--config" #$dmd-conf)))))
+
+(define (operating-system-root-file-system os)
+  "Return the root file system of OS."
+  (find (match-lambda
+         (($ <file-system> _ "/") #t)
+         (_ #f))
+        (operating-system-file-systems os)))
+
 (define (operating-system-derivation os)
   "Return a derivation that builds OS."
+  (define boot-file-systems
+    (filter (match-lambda
+             (($ <file-system> device "/")
+              #t)
+             (($ <file-system> device mount-point type flags options boot?)
+              boot?))
+            (operating-system-file-systems 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))
+      ((profile     (operating-system-profile os))
+       (etc         (operating-system-etc-directory os))
        (services    (sequence %store-monad (operating-system-services os)))
-       (dmd-conf    (dmd-configuration-file services etc))
-
-
-       (boot     (text-file "boot"
-                            (object->string
-                             `(execl ,dmd-file "dmd"
-                                     "--config" ,dmd-conf))))
+       (boot        (operating-system-boot-script os))
        (kernel  ->  (operating-system-kernel os))
-       (kernel-dir  (package-file kernel))
-       (initrd      (operating-system-initrd os))
-       (initrd-file -> (string-append (derivation->output-path initrd)
-                                      "/initrd"))
+       (initrd      ((operating-system-initrd os) boot-file-systems))
+       (initrd-file -> #~(string-append #$initrd "/initrd"))
+       (root-fs ->  (operating-system-root-file-system os))
        (entries ->  (list (menu-entry
                            (label (string-append
                                    "GNU system with "
                                    (package-full-name kernel)
                                    " (technology preview)"))
                            (linux kernel)
-                           (linux-arguments `("--root=/dev/sda1"
-                                              ,(string-append "--load=" boot)))
+                           (linux-arguments
+                            (list (string-append "--root="
+                                                 (file-system-device root-fs))
+                                  #~(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))))))
-    (file-union `(("boot" ,boot)
-                  ("kernel" ,kernel-dir)
+       (grub.cfg (grub-configuration-file entries)))
+    (file-union "system"
+                `(("boot" ,#~#$boot)
+                  ("kernel" ,#~#$kernel)
                   ("initrd" ,initrd-file)
-                  ("dmd.conf" ,dmd-conf)
-                  ("profile" ,profile)
-                  ("grub.cfg" ,grub.cfg)
-                  ("etc" ,etc)
-                  ("system-inputs" ,(derivation->output-path extras)))
-                #:inputs `(("kernel" ,kernel)
-                           ("initrd" ,initrd)
-                           ("bash" ,bash)
-                           ("profile" ,profile-drv)
-                           ("etc" ,etc-drv)
-                           ("system-inputs" ,extras))
-                #:name "system")))
+                  ("profile" ,#~#$profile)
+                  ("grub.cfg" ,#~#$grub.cfg)
+                  ("etc" ,#~#$etc)))))
 
 ;;; system.scm ends here