2013-12-09 15:32:36 -05:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2014-01-25 11:22:53 -05:00
|
|
|
|
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
2013-12-09 15:32:36 -05:00
|
|
|
|
;;;
|
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
;;; your option) any later version.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
|
;;;
|
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
(define-module (gnu system)
|
|
|
|
|
#:use-module (guix store)
|
|
|
|
|
#:use-module (guix monads)
|
2014-04-26 10:36:48 -04:00
|
|
|
|
#:use-module (guix gexp)
|
2013-12-09 15:32:36 -05:00
|
|
|
|
#:use-module (guix records)
|
|
|
|
|
#:use-module (guix packages)
|
|
|
|
|
#:use-module (guix derivations)
|
2014-08-11 16:18:33 -04:00
|
|
|
|
#:use-module (guix profiles)
|
2013-12-09 15:32:36 -05:00
|
|
|
|
#:use-module (gnu packages base)
|
|
|
|
|
#:use-module (gnu packages bash)
|
gnu: Split (gnu packages base), adding (gnu packages commencement).
* gnu/packages/base.scm (gnu-make-boot0, diffutils-boot0,
findutils-boot0, %boot0-inputs, nix-system->gnu-triplet, boot-triplet,
binutils-boot0, gcc-boot0, perl-boot0, linux-libre-headers-boot0,
texinfo-boot0, %boot1-inputs, glibc-final-with-bootstrap-bash,
cross-gcc-wrapper, static-bash-for-glibc, glibc-final,
gcc-boot0-wrapped, %boot2-inputs, binutils-final, libstdc++,
gcc-final, ld-wrapper-boot3, %boot3-inputs, bash-final, %boot4-inputs,
guile-final, gnu-make-final, ld-wrapper, coreutils-final, grep-final,
%boot5-inputs, %final-inputs, canonical-package, gcc-toolchain,
gcc-toolchain-4.8, gcc-toolchain-4.9): Move to...
* gnu/packages/commencement.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* build-aux/check-final-inputs-self-contained.scm: Adjust accordingly.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/make-bootstrap.scm: Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/gnu.scm (standard-packages, gnu-build,
gnu-cross-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* guix/download.scm (url-fetch): Likewise.
* guix/gexp.scm (default-guile): Likewise.
* guix/git-download.scm (git-fetch): Likewise.
* guix/monads.scm (run-with-store): Likewise.
* guix/packages.scm (default-guile): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/scripts/refresh.scm: Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths):
Likewise.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/guix-package.sh: Likewise.
* gnu/services/base.scm: Use 'canonical-package' instead of xxx-final.
* gnu/services/xorg.scm: Likewise.
* gnu/system/vm.scm: Likewise.
* guix/scripts/pull.scm (guix-pull): Likewise.
2014-08-26 18:25:17 -04:00
|
|
|
|
#:use-module (gnu packages guile)
|
2014-07-12 16:53:56 -04:00
|
|
|
|
#:use-module (gnu packages which)
|
2014-01-13 17:21:47 -05:00
|
|
|
|
#:use-module (gnu packages admin)
|
2014-05-29 17:13:11 -04:00
|
|
|
|
#:use-module (gnu packages linux)
|
2013-12-09 15:32:36 -05:00
|
|
|
|
#:use-module (gnu packages package-management)
|
2014-06-04 08:59:24 -04:00
|
|
|
|
#:use-module (gnu packages which)
|
|
|
|
|
#:use-module (gnu packages less)
|
|
|
|
|
#:use-module (gnu packages zile)
|
2014-07-14 09:35:57 -04:00
|
|
|
|
#:use-module (gnu packages nano)
|
|
|
|
|
#:use-module (gnu packages lsof)
|
2014-09-12 16:13:23 -04:00
|
|
|
|
#:use-module (gnu packages gawk)
|
|
|
|
|
#:use-module (gnu packages compression)
|
|
|
|
|
#:autoload (gnu packages cryptsetup) (cryptsetup)
|
2014-02-19 14:58:24 -05:00
|
|
|
|
#:use-module (gnu services)
|
|
|
|
|
#:use-module (gnu services dmd)
|
|
|
|
|
#:use-module (gnu services base)
|
2013-12-09 15:32:36 -05:00
|
|
|
|
#:use-module (gnu system grub)
|
|
|
|
|
#:use-module (gnu system shadow)
|
|
|
|
|
#:use-module (gnu system linux)
|
2014-01-29 07:04:00 -05:00
|
|
|
|
#:use-module (gnu system linux-initrd)
|
2014-05-20 15:59:08 -04:00
|
|
|
|
#:use-module (gnu system file-systems)
|
2013-12-09 15:32:36 -05:00
|
|
|
|
#:use-module (ice-9 match)
|
|
|
|
|
#:use-module (srfi srfi-1)
|
|
|
|
|
#:use-module (srfi srfi-26)
|
|
|
|
|
#:export (operating-system
|
|
|
|
|
operating-system?
|
2014-05-18 15:58:01 -04:00
|
|
|
|
|
|
|
|
|
operating-system-bootloader
|
2013-12-09 15:32:36 -05:00
|
|
|
|
operating-system-services
|
2014-05-09 16:58:46 -04:00
|
|
|
|
operating-system-user-services
|
2013-12-09 15:32:36 -05:00
|
|
|
|
operating-system-packages
|
2014-01-31 08:36:48 -05:00
|
|
|
|
operating-system-host-name
|
2014-09-11 16:03:24 -04:00
|
|
|
|
operating-system-hosts-file
|
2014-01-31 08:36:48 -05:00
|
|
|
|
operating-system-kernel
|
|
|
|
|
operating-system-initrd
|
|
|
|
|
operating-system-users
|
|
|
|
|
operating-system-groups
|
2014-05-31 16:01:05 -04:00
|
|
|
|
operating-system-issue
|
2014-01-31 08:36:48 -05:00
|
|
|
|
operating-system-packages
|
|
|
|
|
operating-system-timezone
|
|
|
|
|
operating-system-locale
|
2014-09-11 17:39:15 -04:00
|
|
|
|
operating-system-mapped-devices
|
2014-05-02 18:26:07 -04:00
|
|
|
|
operating-system-file-systems
|
2014-06-26 18:06:46 -04:00
|
|
|
|
operating-system-activation-script
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
2014-04-27 08:58:15 -04:00
|
|
|
|
operating-system-derivation
|
2014-05-02 18:26:07 -04:00
|
|
|
|
operating-system-profile
|
2014-06-04 08:59:24 -04:00
|
|
|
|
operating-system-grub.cfg
|
|
|
|
|
|
2014-09-09 11:12:33 -04:00
|
|
|
|
%setuid-programs
|
2014-09-11 17:39:15 -04:00
|
|
|
|
%base-packages
|
|
|
|
|
|
|
|
|
|
luks-device-mapping))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
;;;
|
|
|
|
|
;;; This module supports whole-system configuration.
|
|
|
|
|
;;;
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
;; System-wide configuration.
|
|
|
|
|
;; TODO: Add per-field docstrings/stexi.
|
|
|
|
|
(define-record-type* <operating-system> operating-system
|
|
|
|
|
make-operating-system
|
|
|
|
|
operating-system?
|
|
|
|
|
(kernel operating-system-kernel ; package
|
|
|
|
|
(default linux-libre))
|
2014-05-18 15:58:01 -04:00
|
|
|
|
(bootloader operating-system-bootloader) ; <grub-configuration>
|
|
|
|
|
|
2014-05-02 18:26:07 -04:00
|
|
|
|
(initrd operating-system-initrd ; (list fs) -> M derivation
|
2014-06-30 14:56:45 -04:00
|
|
|
|
(default base-initrd))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
|
|
|
|
(host-name operating-system-host-name) ; string
|
2014-09-11 16:03:24 -04:00
|
|
|
|
(hosts-file operating-system-hosts-file ; M item | #f
|
|
|
|
|
(default #f))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
2014-09-11 17:39:15 -04:00
|
|
|
|
(mapped-devices operating-system-mapped-devices ; list of <mapped-device>
|
|
|
|
|
(default '()))
|
2014-06-26 18:11:38 -04:00
|
|
|
|
(file-systems operating-system-file-systems) ; list of fs
|
2014-09-18 16:51:48 -04:00
|
|
|
|
(swap-devices operating-system-swap-devices ; list of strings
|
|
|
|
|
(default '()))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
|
|
|
|
(users operating-system-users ; list of user accounts
|
|
|
|
|
(default '()))
|
|
|
|
|
(groups operating-system-groups ; list of user groups
|
2014-06-22 16:16:14 -04:00
|
|
|
|
(default %base-groups))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
2014-05-12 17:37:13 -04:00
|
|
|
|
(skeletons operating-system-skeletons ; list of name/monadic value
|
|
|
|
|
(default (default-skeletons)))
|
2014-05-31 16:01:05 -04:00
|
|
|
|
(issue operating-system-issue ; string
|
|
|
|
|
(default %default-issue))
|
2014-05-12 17:37:13 -04:00
|
|
|
|
|
2013-12-09 15:32:36 -05:00
|
|
|
|
(packages operating-system-packages ; list of (PACKAGE OUTPUT...)
|
2014-06-04 08:59:24 -04:00
|
|
|
|
(default %base-packages)) ; or just PACKAGE
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
|
|
|
|
(timezone operating-system-timezone) ; string
|
2014-06-26 18:11:38 -04:00
|
|
|
|
(locale operating-system-locale ; string
|
|
|
|
|
(default "en_US.UTF-8"))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
2014-05-09 16:58:46 -04:00
|
|
|
|
(services operating-system-user-services ; list of monadic services
|
2014-04-30 16:17:56 -04:00
|
|
|
|
(default %base-services))
|
|
|
|
|
|
|
|
|
|
(pam-services operating-system-pam-services ; list of PAM services
|
|
|
|
|
(default (base-pam-services)))
|
|
|
|
|
(setuid-programs operating-system-setuid-programs
|
2014-05-01 09:29:24 -04:00
|
|
|
|
(default %setuid-programs)) ; list of string-valued gexps
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
2014-05-01 09:29:24 -04:00
|
|
|
|
(sudoers operating-system-sudoers ; /etc/sudoers contents
|
|
|
|
|
(default %sudoers-specification)))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Derivation.
|
|
|
|
|
;;;
|
|
|
|
|
|
2014-04-27 10:50:34 -04:00
|
|
|
|
(define* (file-union name files)
|
2013-12-09 15:32:36 -05:00
|
|
|
|
"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
|
2014-04-27 10:50:34 -04:00
|
|
|
|
in the new directory, and the second element is a gexp denoting the target
|
|
|
|
|
file."
|
|
|
|
|
(define builder
|
|
|
|
|
#~(begin
|
|
|
|
|
(mkdir #$output)
|
|
|
|
|
(chdir #$output)
|
|
|
|
|
#$@(map (match-lambda
|
|
|
|
|
((target source)
|
|
|
|
|
#~(symlink #$source #$target)))
|
|
|
|
|
files)))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
2014-04-27 10:50:34 -04:00
|
|
|
|
(gexp->derivation name builder))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
2014-05-12 17:37:13 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Services.
|
|
|
|
|
;;;
|
|
|
|
|
|
2014-09-18 13:18:39 -04:00
|
|
|
|
(define (open-luks-device source target)
|
2014-09-11 17:39:15 -04:00
|
|
|
|
"Return a gexp that maps SOURCE to TARGET as a LUKS device, using
|
|
|
|
|
'cryptsetup'."
|
|
|
|
|
#~(zero? (system* (string-append #$cryptsetup "/sbin/cryptsetup")
|
|
|
|
|
"open" "--type" "luks"
|
|
|
|
|
#$source #$target)))
|
|
|
|
|
|
2014-09-18 13:18:39 -04:00
|
|
|
|
(define (close-luks-device source target)
|
|
|
|
|
"Return a gexp that closes TARGET, a LUKS device."
|
|
|
|
|
#~(zero? (system* (string-append #$cryptsetup "/sbin/cryptsetup")
|
|
|
|
|
"close" #$target)))
|
|
|
|
|
|
|
|
|
|
(define luks-device-mapping
|
|
|
|
|
;; The type of LUKS mapped devices.
|
|
|
|
|
(mapped-device-kind
|
|
|
|
|
(open open-luks-device)
|
|
|
|
|
(close close-luks-device)))
|
|
|
|
|
|
2014-05-10 17:33:52 -04:00
|
|
|
|
(define (other-file-system-services os)
|
|
|
|
|
"Return file system services for the file systems of OS that are not marked
|
|
|
|
|
as 'needed-for-boot'."
|
|
|
|
|
(define file-systems
|
|
|
|
|
(remove (lambda (fs)
|
|
|
|
|
(or (file-system-needed-for-boot? fs)
|
|
|
|
|
(string=? "/" (file-system-mount-point fs))))
|
|
|
|
|
(operating-system-file-systems os)))
|
|
|
|
|
|
2014-09-11 17:39:15 -04:00
|
|
|
|
(define (device-mappings fs)
|
|
|
|
|
(filter (lambda (md)
|
|
|
|
|
(string=? (string-append "/dev/mapper/"
|
|
|
|
|
(mapped-device-target md))
|
|
|
|
|
(file-system-device fs)))
|
|
|
|
|
(operating-system-mapped-devices os)))
|
|
|
|
|
|
|
|
|
|
(define (requirements fs)
|
|
|
|
|
(map (lambda (md)
|
|
|
|
|
(symbol-append 'device-mapping-
|
|
|
|
|
(string->symbol (mapped-device-target md))))
|
|
|
|
|
(device-mappings fs)))
|
|
|
|
|
|
2014-05-10 17:33:52 -04:00
|
|
|
|
(sequence %store-monad
|
2014-09-11 17:39:15 -04:00
|
|
|
|
(map (lambda (fs)
|
|
|
|
|
(match fs
|
|
|
|
|
(($ <file-system> device title target type flags opts
|
|
|
|
|
#f check? create?)
|
|
|
|
|
(file-system-service device target type
|
|
|
|
|
#:title title
|
|
|
|
|
#:requirements (requirements fs)
|
|
|
|
|
#:check? check?
|
|
|
|
|
#:create-mount-point? create?
|
|
|
|
|
#:options opts
|
|
|
|
|
#:flags flags))))
|
2014-05-10 17:33:52 -04:00
|
|
|
|
file-systems)))
|
|
|
|
|
|
2014-09-22 05:06:42 -04:00
|
|
|
|
(define (mapped-device-user device file-systems)
|
|
|
|
|
"Return a file system among FILE-SYSTEMS that uses DEVICE, or #f."
|
|
|
|
|
(let ((target (string-append "/dev/mapper/" (mapped-device-target device))))
|
|
|
|
|
(find (lambda (fs)
|
|
|
|
|
(string=? (file-system-device fs) target))
|
|
|
|
|
file-systems)))
|
|
|
|
|
|
|
|
|
|
(define (operating-system-user-mapped-devices os)
|
|
|
|
|
"Return the subset of mapped devices that can be installed in
|
|
|
|
|
user-land--i.e., those not needed during boot."
|
|
|
|
|
(let ((devices (operating-system-mapped-devices os))
|
|
|
|
|
(file-systems (operating-system-file-systems os)))
|
|
|
|
|
(filter (lambda (md)
|
|
|
|
|
(let ((user (mapped-device-user md file-systems)))
|
|
|
|
|
(or (not user)
|
|
|
|
|
(not (file-system-needed-for-boot? user)))))
|
|
|
|
|
devices)))
|
|
|
|
|
|
|
|
|
|
(define (operating-system-boot-mapped-devices os)
|
|
|
|
|
"Return the subset of mapped devices that must be installed during boot,
|
|
|
|
|
from the initrd."
|
|
|
|
|
(let ((devices (operating-system-mapped-devices os))
|
|
|
|
|
(file-systems (operating-system-file-systems os)))
|
|
|
|
|
(filter (lambda (md)
|
|
|
|
|
(let ((user (mapped-device-user md file-systems)))
|
|
|
|
|
(and user (file-system-needed-for-boot? user))))
|
|
|
|
|
devices)))
|
|
|
|
|
|
2014-09-11 17:39:15 -04:00
|
|
|
|
(define (device-mapping-services os)
|
|
|
|
|
"Return the list of device-mapping services for OS as a monadic list."
|
|
|
|
|
(sequence %store-monad
|
|
|
|
|
(map (lambda (md)
|
2014-09-18 13:18:39 -04:00
|
|
|
|
(let* ((source (mapped-device-source md))
|
|
|
|
|
(target (mapped-device-target md))
|
|
|
|
|
(type (mapped-device-type md))
|
|
|
|
|
(open (mapped-device-kind-open type))
|
|
|
|
|
(close (mapped-device-kind-close type)))
|
2014-09-11 17:39:15 -04:00
|
|
|
|
(device-mapping-service target
|
2014-09-18 13:18:39 -04:00
|
|
|
|
(open source target)
|
|
|
|
|
(close source target))))
|
2014-09-22 05:06:42 -04:00
|
|
|
|
(operating-system-user-mapped-devices os))))
|
2014-09-11 17:39:15 -04:00
|
|
|
|
|
2014-09-18 16:51:48 -04:00
|
|
|
|
(define (swap-services os)
|
|
|
|
|
"Return the list of swap services for OS as a monadic list."
|
|
|
|
|
(sequence %store-monad
|
|
|
|
|
(map swap-service (operating-system-swap-devices os))))
|
|
|
|
|
|
2014-05-09 16:58:46 -04:00
|
|
|
|
(define (essential-services os)
|
|
|
|
|
"Return the list of essential services for OS. These are special services
|
|
|
|
|
that implement part of what's declared in OS are responsible for low-level
|
|
|
|
|
bookkeeping."
|
2014-09-11 17:39:15 -04:00
|
|
|
|
(mlet* %store-monad ((mappings (device-mapping-services os))
|
|
|
|
|
(root-fs (root-file-system-service))
|
2014-05-10 17:33:52 -04:00
|
|
|
|
(other-fs (other-file-system-services os))
|
2014-09-18 16:51:48 -04:00
|
|
|
|
(swaps (swap-services os))
|
2014-05-10 17:33:52 -04:00
|
|
|
|
(procs (user-processes-service
|
|
|
|
|
(map (compose first service-provision)
|
|
|
|
|
other-fs)))
|
|
|
|
|
(host-name (host-name-service
|
|
|
|
|
(operating-system-host-name os))))
|
2014-09-11 17:39:15 -04:00
|
|
|
|
(return (cons* host-name procs root-fs
|
2014-09-18 16:51:48 -04:00
|
|
|
|
(append other-fs mappings swaps)))))
|
2014-05-09 16:58:46 -04:00
|
|
|
|
|
|
|
|
|
(define (operating-system-services os)
|
|
|
|
|
"Return all the services of OS, including \"internal\" services that do not
|
|
|
|
|
explicitly appear in OS."
|
|
|
|
|
(mlet %store-monad
|
|
|
|
|
((user (sequence %store-monad (operating-system-user-services os)))
|
|
|
|
|
(essential (essential-services os)))
|
|
|
|
|
(return (append essential user))))
|
|
|
|
|
|
2014-05-12 17:37:13 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; /etc.
|
|
|
|
|
;;;
|
|
|
|
|
|
2014-06-04 08:59:24 -04:00
|
|
|
|
(define %base-packages
|
|
|
|
|
;; Default set of packages globally visible. It should include anything
|
|
|
|
|
;; required for basic administrator tasks.
|
2014-07-14 09:35:57 -04:00
|
|
|
|
(cons* procps psmisc which less zile nano
|
gnu: Split (gnu packages base), adding (gnu packages commencement).
* gnu/packages/base.scm (gnu-make-boot0, diffutils-boot0,
findutils-boot0, %boot0-inputs, nix-system->gnu-triplet, boot-triplet,
binutils-boot0, gcc-boot0, perl-boot0, linux-libre-headers-boot0,
texinfo-boot0, %boot1-inputs, glibc-final-with-bootstrap-bash,
cross-gcc-wrapper, static-bash-for-glibc, glibc-final,
gcc-boot0-wrapped, %boot2-inputs, binutils-final, libstdc++,
gcc-final, ld-wrapper-boot3, %boot3-inputs, bash-final, %boot4-inputs,
guile-final, gnu-make-final, ld-wrapper, coreutils-final, grep-final,
%boot5-inputs, %final-inputs, canonical-package, gcc-toolchain,
gcc-toolchain-4.8, gcc-toolchain-4.9): Move to...
* gnu/packages/commencement.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* build-aux/check-final-inputs-self-contained.scm: Adjust accordingly.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/make-bootstrap.scm: Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/gnu.scm (standard-packages, gnu-build,
gnu-cross-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* guix/download.scm (url-fetch): Likewise.
* guix/gexp.scm (default-guile): Likewise.
* guix/git-download.scm (git-fetch): Likewise.
* guix/monads.scm (run-with-store): Likewise.
* guix/packages.scm (default-guile): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/scripts/refresh.scm: Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths):
Likewise.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/guix-package.sh: Likewise.
* gnu/services/base.scm: Use 'canonical-package' instead of xxx-final.
* gnu/services/xorg.scm: Likewise.
* gnu/system/vm.scm: Likewise.
* guix/scripts/pull.scm (guix-pull): Likewise.
2014-08-26 18:25:17 -04:00
|
|
|
|
(@ (gnu packages admin) dmd) guix
|
2014-07-14 09:35:57 -04:00
|
|
|
|
lsof ;for Guix's 'list-runtime-roots'
|
2014-09-12 16:13:23 -04:00
|
|
|
|
util-linux inetutils isc-dhcp wireless-tools
|
2014-06-18 17:28:54 -04:00
|
|
|
|
net-tools ; XXX: remove when Inetutils suffices
|
2014-07-16 09:50:13 -04:00
|
|
|
|
|
|
|
|
|
;; Get 'insmod' & co. from kmod, not module-init-tools, since udev
|
|
|
|
|
;; already depends on it anyway.
|
2014-09-13 04:54:47 -04:00
|
|
|
|
kmod eudev
|
2014-07-16 09:50:13 -04:00
|
|
|
|
|
2014-07-16 09:54:15 -04:00
|
|
|
|
e2fsprogs kbd
|
2014-06-18 17:28:54 -04:00
|
|
|
|
|
|
|
|
|
;; The packages below are also in %FINAL-INPUTS, so take them from
|
|
|
|
|
;; there to avoid duplication.
|
|
|
|
|
(map canonical-package
|
2014-09-12 16:13:23 -04:00
|
|
|
|
(list guile-2.0 bash coreutils findutils grep sed
|
2014-09-22 17:11:33 -04:00
|
|
|
|
diffutils patch gawk tar gzip bzip2 xz lzip))))
|
2014-06-04 08:59:24 -04:00
|
|
|
|
|
2014-05-31 16:01:05 -04:00
|
|
|
|
(define %default-issue
|
|
|
|
|
;; Default contents for /etc/issue.
|
|
|
|
|
"
|
|
|
|
|
This is the GNU system. Welcome.\n")
|
|
|
|
|
|
2014-09-11 16:03:24 -04:00
|
|
|
|
(define (default-/etc/hosts host-name)
|
|
|
|
|
"Return the default /etc/hosts file."
|
|
|
|
|
(text-file "hosts"
|
2014-09-12 03:52:05 -04:00
|
|
|
|
(string-append "127.0.0.1 localhost " host-name "\n"
|
|
|
|
|
"::1 localhost " host-name "\n")))
|
2014-09-11 16:03:24 -04:00
|
|
|
|
|
2013-12-09 15:32:36 -05:00
|
|
|
|
(define* (etc-directory #:key
|
2013-12-10 15:46:59 -05:00
|
|
|
|
(locale "C") (timezone "Europe/Paris")
|
2014-05-31 16:01:05 -04:00
|
|
|
|
(issue "Hello!\n")
|
2014-05-12 17:37:13 -04:00
|
|
|
|
(skeletons '())
|
2013-12-09 15:32:36 -05:00
|
|
|
|
(pam-services '())
|
2014-05-17 11:39:30 -04:00
|
|
|
|
(profile "/run/current-system/profile")
|
2014-09-11 16:03:24 -04:00
|
|
|
|
hosts-file
|
2014-05-01 09:29:24 -04:00
|
|
|
|
(sudoers ""))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
"Return a derivation that builds the static part of the /etc directory."
|
|
|
|
|
(mlet* %store-monad
|
system: Make accounts and groups at activation time.
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
2014-05-11 16:41:01 -04:00
|
|
|
|
((pam.d (pam-services->directory pam-services))
|
2014-05-01 09:29:24 -04:00
|
|
|
|
(sudoers (text-file "sudoers" sudoers))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
(login.defs (text-file "login.defs" "# Empty for now.\n"))
|
2014-02-19 15:30:16 -05:00
|
|
|
|
(shells (text-file "shells" ; used by xterm and others
|
|
|
|
|
"\
|
|
|
|
|
/bin/sh
|
2014-05-17 11:39:30 -04:00
|
|
|
|
/run/current-system/profile/bin/sh
|
|
|
|
|
/run/current-system/profile/bin/bash\n"))
|
2014-05-31 16:01:05 -04:00
|
|
|
|
(issue (text-file "issue" issue))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
2014-09-12 03:55:25 -04:00
|
|
|
|
;; For now, generate a basic config so that /etc/hosts is honored.
|
|
|
|
|
(nsswitch (text-file "nsswitch.conf"
|
|
|
|
|
"hosts: files dns\n"))
|
|
|
|
|
|
2013-12-09 15:32:36 -05:00
|
|
|
|
;; TODO: Generate bashrc from packages' search-paths.
|
2014-02-05 16:22:51 -05:00
|
|
|
|
(bashrc (text-file* "bashrc" "
|
2014-09-11 17:21:42 -04:00
|
|
|
|
export PS1='\\u@\\h \\w\\$ '
|
2013-12-10 15:46:59 -05:00
|
|
|
|
|
|
|
|
|
export LC_ALL=\"" locale "\"
|
|
|
|
|
export TZ=\"" timezone "\"
|
2014-02-05 16:22:51 -05:00
|
|
|
|
export TZDIR=\"" tzdata "/share/zoneinfo\"
|
2013-12-10 15:46:59 -05:00
|
|
|
|
|
2014-06-04 10:22:48 -04:00
|
|
|
|
# Tell 'modprobe' & co. where to look for modules.
|
2014-06-29 16:02:42 -04:00
|
|
|
|
export LINUX_MODULE_DIRECTORY=/run/booted-system/kernel/lib/modules
|
2014-06-04 10:22:48 -04:00
|
|
|
|
|
2014-06-03 05:48:41 -04:00
|
|
|
|
export PATH=$HOME/.guix-profile/bin:/run/current-system/profile/bin
|
|
|
|
|
export PATH=/run/setuid-programs:/run/current-system/profile/sbin:$PATH
|
2013-12-09 15:32:36 -05:00
|
|
|
|
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'
|
2014-05-12 17:37:13 -04:00
|
|
|
|
"))
|
|
|
|
|
(skel (skeleton-directory skeletons)))
|
2014-04-27 10:50:34 -04:00
|
|
|
|
(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)
|
2014-09-12 03:55:25 -04:00
|
|
|
|
("nsswitch.conf" ,#~#$nsswitch)
|
2014-05-12 17:37:13 -04:00
|
|
|
|
("skel" ,#~#$skel)
|
2014-04-27 10:50:34 -04:00
|
|
|
|
("shells" ,#~#$shells)
|
|
|
|
|
("profile" ,#~#$bashrc)
|
2014-09-11 16:03:24 -04:00
|
|
|
|
("hosts" ,#~#$hosts-file)
|
2014-04-27 10:50:34 -04:00
|
|
|
|
("localtime" ,#~(string-append #$tzdata "/share/zoneinfo/"
|
|
|
|
|
#$timezone))
|
2014-05-01 09:29:24 -04:00
|
|
|
|
("sudoers" ,#~#$sudoers)))))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
2014-04-27 08:58:15 -04:00
|
|
|
|
(define (operating-system-profile os)
|
2014-08-11 16:18:33 -04:00
|
|
|
|
"Return a derivation that builds the system profile of OS."
|
|
|
|
|
(profile-derivation (manifest (map package->manifest-entry
|
|
|
|
|
(operating-system-packages os)))))
|
2014-02-01 19:34:33 -05:00
|
|
|
|
|
system: Make accounts and groups at activation time.
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
2014-05-11 16:41:01 -04:00
|
|
|
|
(define %root-account
|
|
|
|
|
;; Default root account.
|
|
|
|
|
(user-account
|
|
|
|
|
(name "root")
|
|
|
|
|
(password "")
|
|
|
|
|
(uid 0) (group "root")
|
|
|
|
|
(comment "System administrator")
|
|
|
|
|
(home-directory "/root")))
|
|
|
|
|
|
2014-04-23 09:47:42 -04:00
|
|
|
|
(define (operating-system-accounts os)
|
|
|
|
|
"Return the user accounts for OS, including an obligatory 'root' account."
|
system: Make accounts and groups at activation time.
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
2014-05-11 16:41:01 -04:00
|
|
|
|
(define users
|
|
|
|
|
;; Make sure there's a root account.
|
|
|
|
|
(if (find (lambda (user)
|
|
|
|
|
(and=> (user-account-uid user) zero?))
|
|
|
|
|
(operating-system-users os))
|
|
|
|
|
(operating-system-users os)
|
|
|
|
|
(cons %root-account (operating-system-users os))))
|
|
|
|
|
|
2014-05-09 16:58:46 -04:00
|
|
|
|
(mlet %store-monad ((services (operating-system-services os)))
|
system: Make accounts and groups at activation time.
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
2014-05-11 16:41:01 -04:00
|
|
|
|
(return (append users
|
|
|
|
|
(append-map service-user-accounts services)))))
|
2014-04-23 09:47:42 -04:00
|
|
|
|
|
|
|
|
|
(define (operating-system-etc-directory os)
|
|
|
|
|
"Return that static part of the /etc directory of OS."
|
2013-12-09 15:32:36 -05:00
|
|
|
|
(mlet* %store-monad
|
2014-05-09 16:58:46 -04:00
|
|
|
|
((services (operating-system-services os))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
(pam-services ->
|
|
|
|
|
;; Services known to PAM.
|
|
|
|
|
(delete-duplicates
|
2014-04-30 16:17:56 -04:00
|
|
|
|
(append (operating-system-pam-services os)
|
|
|
|
|
(append-map service-pam-services services))))
|
2014-05-12 17:37:13 -04:00
|
|
|
|
(profile-drv (operating-system-profile os))
|
2014-09-11 16:03:24 -04:00
|
|
|
|
(skeletons (operating-system-skeletons os))
|
|
|
|
|
(/etc/hosts (or (operating-system-hosts-file os)
|
|
|
|
|
(default-/etc/hosts (operating-system-host-name os)))))
|
2014-06-29 16:02:42 -04:00
|
|
|
|
(etc-directory #:pam-services pam-services
|
2014-05-12 17:37:13 -04:00
|
|
|
|
#:skeletons skeletons
|
2014-05-31 16:01:05 -04:00
|
|
|
|
#:issue (operating-system-issue os)
|
2014-04-23 09:47:42 -04:00
|
|
|
|
#:locale (operating-system-locale os)
|
|
|
|
|
#:timezone (operating-system-timezone os)
|
2014-09-11 16:03:24 -04:00
|
|
|
|
#:hosts-file /etc/hosts
|
2014-05-01 09:29:24 -04:00
|
|
|
|
#:sudoers (operating-system-sudoers os)
|
2014-04-23 09:47:42 -04:00
|
|
|
|
#:profile profile-drv)))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
2014-04-30 16:17:56 -04:00
|
|
|
|
(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")
|
2014-05-01 09:29:24 -04:00
|
|
|
|
#~(string-append #$inetutils "/bin/ping")
|
2014-05-29 17:13:11 -04:00
|
|
|
|
#~(string-append #$sudo "/bin/sudo")
|
|
|
|
|
#~(string-append #$fuse "/bin/fusermount"))))
|
2014-05-01 09:29:24 -04:00
|
|
|
|
|
|
|
|
|
(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")
|
2014-04-30 16:17:56 -04:00
|
|
|
|
|
system: Make accounts and groups at activation time.
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
2014-05-11 16:41:01 -04:00
|
|
|
|
(define (user-group->gexp group)
|
|
|
|
|
"Turn GROUP, a <user-group> object, into a list-valued gexp suitable for
|
|
|
|
|
'active-groups'."
|
|
|
|
|
#~(list #$(user-group-name group)
|
|
|
|
|
#$(user-group-password group)
|
2014-07-24 18:12:35 -04:00
|
|
|
|
#$(user-group-id group)
|
|
|
|
|
#$(user-group-system? group)))
|
system: Make accounts and groups at activation time.
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
2014-05-11 16:41:01 -04:00
|
|
|
|
|
|
|
|
|
(define (user-account->gexp account)
|
|
|
|
|
"Turn ACCOUNT, a <user-account> object, into a list-valued gexp suitable for
|
|
|
|
|
'activate-users'."
|
|
|
|
|
#~`(#$(user-account-name account)
|
|
|
|
|
#$(user-account-uid account)
|
|
|
|
|
#$(user-account-group account)
|
|
|
|
|
#$(user-account-supplementary-groups account)
|
|
|
|
|
#$(user-account-comment account)
|
|
|
|
|
#$(user-account-home-directory account)
|
|
|
|
|
,#$(user-account-shell account) ; this one is a gexp
|
2014-06-27 12:57:33 -04:00
|
|
|
|
#$(user-account-password account)
|
|
|
|
|
#$(user-account-system? account)))
|
system: Make accounts and groups at activation time.
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
2014-05-11 16:41:01 -04:00
|
|
|
|
|
2014-05-24 09:51:57 -04:00
|
|
|
|
(define (operating-system-activation-script os)
|
|
|
|
|
"Return the activation script for OS---i.e., the code that \"activates\" the
|
|
|
|
|
stateful part of OS, including user accounts and groups, special directories,
|
|
|
|
|
etc."
|
2014-04-30 16:17:56 -04:00
|
|
|
|
(define %modules
|
2014-09-03 04:47:05 -04:00
|
|
|
|
'((gnu build activation)
|
2014-09-03 05:14:12 -04:00
|
|
|
|
(gnu build linux-boot)
|
Move part of (gnu build linux-boot) to (gnu build file-systems).
* gnu/build/linux-boot.scm (%ext2-endianness, %ext2-sblock-magic,
%ext2-sblock-creator-os, %ext2-sblock-uuid, %ext2-sblock-volume-name,
read-ext2-superblock, ext2-superblock-uuid,
ext2-superblock-volume-name, disk-partitions,
partition-label-predicate, find-partition-by-label,
canonicalize-device-spec, MS_RDONLY, MS_NOSUID, MS_NODEV, MS_NOEXEC,
MS_BIND, MS_MOVE, bind-mount, check-file-system,
mount-flags->bit-mask, mount-file-system): Move to...
* gnu/build/file-systems.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* gnu/services/base.scm: Use (gnu build file-systems).
* gnu/services/dmd.scm (dmd-configuration-file): Likewise.
* gnu/system.scm (operating-system-activation-script): Likewise.
* gnu/system/linux-initrd.scm (base-initrd): Likewise.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Likewise.
2014-09-03 08:19:51 -04:00
|
|
|
|
(gnu build file-systems)
|
2014-09-03 04:47:05 -04:00
|
|
|
|
(guix build utils)))
|
2014-04-30 16:17:56 -04:00
|
|
|
|
|
2014-05-24 12:03:27 -04:00
|
|
|
|
(define (service-activations services)
|
|
|
|
|
;; Return the activation scripts for SERVICES.
|
|
|
|
|
(let ((gexps (filter-map service-activate services)))
|
|
|
|
|
(sequence %store-monad (map (cut gexp->file "activate-service.scm" <>)
|
|
|
|
|
gexps))))
|
|
|
|
|
|
system: Make accounts and groups at activation time.
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
2014-05-11 16:41:01 -04:00
|
|
|
|
(mlet* %store-monad ((services (operating-system-services os))
|
2014-05-24 12:03:27 -04:00
|
|
|
|
(actions (service-activations services))
|
system: Make accounts and groups at activation time.
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
2014-05-11 16:41:01 -04:00
|
|
|
|
(etc (operating-system-etc-directory os))
|
|
|
|
|
(modules (imported-modules %modules))
|
|
|
|
|
(compiled (compiled-modules %modules))
|
|
|
|
|
(accounts (operating-system-accounts os)))
|
2014-04-30 16:17:56 -04:00
|
|
|
|
(define setuid-progs
|
|
|
|
|
(operating-system-setuid-programs os))
|
|
|
|
|
|
system: Make accounts and groups at activation time.
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
2014-05-11 16:41:01 -04:00
|
|
|
|
(define user-specs
|
|
|
|
|
(map user-account->gexp accounts))
|
|
|
|
|
|
|
|
|
|
(define groups
|
|
|
|
|
(append (operating-system-groups os)
|
|
|
|
|
(append-map service-user-groups services)))
|
|
|
|
|
|
|
|
|
|
(define group-specs
|
|
|
|
|
(map user-group->gexp groups))
|
|
|
|
|
|
2014-06-04 10:08:26 -04:00
|
|
|
|
(gexp->file "activate"
|
2014-04-30 09:44:59 -04:00
|
|
|
|
#~(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)))
|
|
|
|
|
|
2014-09-03 04:47:05 -04:00
|
|
|
|
(use-modules (gnu build activation))
|
2014-04-30 09:44:59 -04:00
|
|
|
|
|
2014-09-11 16:18:52 -04:00
|
|
|
|
;; Make sure /bin/sh is valid and current.
|
|
|
|
|
(activate-/bin/sh
|
|
|
|
|
(string-append #$(canonical-package bash)
|
|
|
|
|
"/bin/sh"))
|
|
|
|
|
|
2014-04-30 09:44:59 -04:00
|
|
|
|
;; Populate /etc.
|
|
|
|
|
(activate-etc #$etc)
|
|
|
|
|
|
system: Make accounts and groups at activation time.
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
2014-05-11 16:41:01 -04:00
|
|
|
|
;; Add users and user groups.
|
|
|
|
|
(setenv "PATH"
|
|
|
|
|
(string-append #$(@ (gnu packages admin) shadow)
|
|
|
|
|
"/sbin"))
|
|
|
|
|
(activate-users+groups (list #$@user-specs)
|
|
|
|
|
(list #$@group-specs))
|
|
|
|
|
|
2014-04-30 16:17:56 -04:00
|
|
|
|
;; Activate setuid programs.
|
|
|
|
|
(activate-setuid-programs (list #$@setuid-progs))
|
|
|
|
|
|
2014-05-24 12:03:27 -04:00
|
|
|
|
;; Run the services' activation snippets.
|
|
|
|
|
;; TODO: Use 'load-compiled'.
|
|
|
|
|
(for-each primitive-load '#$actions)
|
|
|
|
|
|
2014-05-17 11:39:30 -04:00
|
|
|
|
;; Set up /run/current-system.
|
2014-05-24 09:51:57 -04:00
|
|
|
|
(activate-current-system)))))
|
|
|
|
|
|
|
|
|
|
(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."
|
|
|
|
|
(mlet* %store-monad ((services (operating-system-services os))
|
|
|
|
|
(activate (operating-system-activation-script os))
|
|
|
|
|
(dmd-conf (dmd-configuration-file services)))
|
|
|
|
|
(gexp->file "boot"
|
|
|
|
|
#~(begin
|
|
|
|
|
;; Activate the system.
|
|
|
|
|
;; TODO: Use 'load-compiled'.
|
|
|
|
|
(primitive-load #$activate)
|
|
|
|
|
|
|
|
|
|
;; Keep track of the booted system.
|
|
|
|
|
(false-if-exception (delete-file "/run/booted-system"))
|
|
|
|
|
(symlink (readlink "/run/current-system")
|
|
|
|
|
"/run/booted-system")
|
2014-05-17 11:39:30 -04:00
|
|
|
|
|
2014-05-06 12:09:25 -04:00
|
|
|
|
;; Close any remaining open file descriptors to be on the
|
|
|
|
|
;; safe side. This must be the very last thing we do,
|
|
|
|
|
;; because Guile has internal FDs such as 'sleep_pipe'
|
|
|
|
|
;; that need to be alive.
|
|
|
|
|
(let loop ((fd 3))
|
|
|
|
|
(when (< fd 1024)
|
|
|
|
|
(false-if-exception (close-fdes fd))
|
|
|
|
|
(loop (+ 1 fd))))
|
|
|
|
|
|
2014-04-30 09:44:59 -04:00
|
|
|
|
;; Start dmd.
|
|
|
|
|
(execl (string-append #$dmd "/bin/dmd")
|
|
|
|
|
"dmd" "--config" #$dmd-conf)))))
|
2014-04-23 10:52:14 -04:00
|
|
|
|
|
2014-05-02 18:26:07 -04:00
|
|
|
|
(define (operating-system-root-file-system os)
|
|
|
|
|
"Return the root file system of OS."
|
|
|
|
|
(find (match-lambda
|
2014-06-02 17:58:50 -04:00
|
|
|
|
(($ <file-system> _ _ "/") #t)
|
2014-05-02 18:26:07 -04:00
|
|
|
|
(_ #f))
|
|
|
|
|
(operating-system-file-systems os)))
|
|
|
|
|
|
2014-05-17 11:39:30 -04:00
|
|
|
|
(define (operating-system-initrd-file os)
|
|
|
|
|
"Return a gexp denoting the initrd file of OS."
|
2014-05-02 18:26:07 -04:00
|
|
|
|
(define boot-file-systems
|
|
|
|
|
(filter (match-lambda
|
2014-06-02 17:58:50 -04:00
|
|
|
|
(($ <file-system> device title "/")
|
2014-05-03 18:30:39 -04:00
|
|
|
|
#t)
|
2014-06-02 17:58:50 -04:00
|
|
|
|
(($ <file-system> device title mount-point type flags
|
|
|
|
|
options boot?)
|
2014-05-03 18:30:39 -04:00
|
|
|
|
boot?))
|
2014-05-02 18:26:07 -04:00
|
|
|
|
(operating-system-file-systems os)))
|
|
|
|
|
|
2014-09-22 05:06:42 -04:00
|
|
|
|
(define mapped-devices
|
|
|
|
|
(operating-system-boot-mapped-devices os))
|
|
|
|
|
|
|
|
|
|
(define make-initrd
|
|
|
|
|
(operating-system-initrd os))
|
|
|
|
|
|
|
|
|
|
(mlet %store-monad ((initrd (make-initrd boot-file-systems
|
|
|
|
|
#:mapped-devices mapped-devices)))
|
2014-05-17 11:39:30 -04:00
|
|
|
|
(return #~(string-append #$initrd "/initrd"))))
|
|
|
|
|
|
2014-06-25 16:46:44 -04:00
|
|
|
|
(define (kernel->grub-label kernel)
|
|
|
|
|
"Return a label for the GRUB menu entry that boots KERNEL."
|
|
|
|
|
(string-append "GNU system with "
|
|
|
|
|
(string-titlecase (package-name kernel)) " "
|
|
|
|
|
(package-version kernel)
|
|
|
|
|
" (technology preview)"))
|
|
|
|
|
|
2014-06-25 16:54:52 -04:00
|
|
|
|
(define* (operating-system-grub.cfg os #:optional (old-entries '()))
|
|
|
|
|
"Return the GRUB configuration file for OS. Use OLD-ENTRIES to populate the
|
|
|
|
|
\"old entries\" menu."
|
2014-04-23 09:47:42 -04:00
|
|
|
|
(mlet* %store-monad
|
2014-05-17 11:39:30 -04:00
|
|
|
|
((system (operating-system-derivation os))
|
2014-05-02 18:26:07 -04:00
|
|
|
|
(root-fs -> (operating-system-root-file-system os))
|
2014-05-17 11:39:30 -04:00
|
|
|
|
(kernel -> (operating-system-kernel os))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
(entries -> (list (menu-entry
|
2014-06-25 16:46:44 -04:00
|
|
|
|
(label (kernel->grub-label kernel))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
(linux kernel)
|
2014-04-28 17:40:24 -04:00
|
|
|
|
(linux-arguments
|
2014-05-02 18:26:07 -04:00
|
|
|
|
(list (string-append "--root="
|
|
|
|
|
(file-system-device root-fs))
|
2014-05-17 11:39:30 -04:00
|
|
|
|
#~(string-append "--system=" #$system)
|
|
|
|
|
#~(string-append "--load=" #$system
|
|
|
|
|
"/boot")))
|
|
|
|
|
(initrd #~(string-append #$system "/initrd"))))))
|
2014-06-25 16:54:52 -04:00
|
|
|
|
(grub-configuration-file (operating-system-bootloader os) entries
|
|
|
|
|
#:old-entries old-entries)))
|
2014-05-17 11:39:30 -04:00
|
|
|
|
|
2014-06-25 16:48:25 -04:00
|
|
|
|
(define (operating-system-parameters-file os)
|
|
|
|
|
"Return a file that describes the boot parameters of OS. The primary use of
|
|
|
|
|
this file is the reconstruction of GRUB menu entries for old configurations."
|
|
|
|
|
(mlet %store-monad ((initrd (operating-system-initrd-file os))
|
|
|
|
|
(root -> (operating-system-root-file-system os))
|
|
|
|
|
(label -> (kernel->grub-label
|
|
|
|
|
(operating-system-kernel os))))
|
|
|
|
|
(gexp->file "parameters"
|
|
|
|
|
#~(boot-parameters (version 0)
|
|
|
|
|
(label #$label)
|
|
|
|
|
(root-device #$(file-system-device root))
|
|
|
|
|
(kernel #$(operating-system-kernel os))
|
|
|
|
|
(initrd #$initrd)))))
|
|
|
|
|
|
2014-05-17 11:39:30 -04:00
|
|
|
|
(define (operating-system-derivation os)
|
|
|
|
|
"Return a derivation that builds OS."
|
|
|
|
|
(mlet* %store-monad
|
|
|
|
|
((profile (operating-system-profile os))
|
|
|
|
|
(etc (operating-system-etc-directory os))
|
|
|
|
|
(boot (operating-system-boot-script os))
|
|
|
|
|
(kernel -> (operating-system-kernel os))
|
2014-06-25 16:48:25 -04:00
|
|
|
|
(initrd (operating-system-initrd-file os))
|
|
|
|
|
(params (operating-system-parameters-file os)))
|
2014-04-27 10:50:34 -04:00
|
|
|
|
(file-union "system"
|
2014-04-28 17:40:24 -04:00
|
|
|
|
`(("boot" ,#~#$boot)
|
2014-04-27 10:50:34 -04:00
|
|
|
|
("kernel" ,#~#$kernel)
|
2014-06-25 16:48:25 -04:00
|
|
|
|
("parameters" ,#~#$params)
|
2014-05-17 11:39:30 -04:00
|
|
|
|
("initrd" ,initrd)
|
2014-04-27 10:50:34 -04:00
|
|
|
|
("profile" ,#~#$profile)
|
|
|
|
|
("etc" ,#~#$etc)))))
|
2013-12-09 15:32:36 -05:00
|
|
|
|
|
|
|
|
|
;;; system.scm ends here
|