2014-02-18 23:45:58 +01:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2019-01-09 11:25:11 +01:00
|
|
|
|
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
2016-01-08 00:48:17 +01:00
|
|
|
|
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
|
2018-02-19 05:45:03 +01:00
|
|
|
|
;;; Copyright © 2016, 2017, 2018 Chris Marusich <cmmarusich@gmail.com>
|
2017-04-02 15:52:33 +02:00
|
|
|
|
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
2018-06-21 16:54:06 +02:00
|
|
|
|
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
2019-05-10 13:26:16 +02:00
|
|
|
|
;;; Copyright © 2019 Christopher Baines <mail@cbaines.net>
|
2014-02-18 23:45:58 +01: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 (guix scripts system)
|
2014-06-27 00:06:46 +02:00
|
|
|
|
#:use-module (guix config)
|
2014-02-18 23:45:58 +01:00
|
|
|
|
#:use-module (guix ui)
|
2019-02-11 23:05:36 +01:00
|
|
|
|
#:use-module ((guix status) #:select (with-status-verbosity))
|
2014-02-18 23:45:58 +01:00
|
|
|
|
#:use-module (guix store)
|
2018-06-08 10:56:19 +02:00
|
|
|
|
#:autoload (guix store database) (register-path)
|
2016-03-02 13:43:13 +01:00
|
|
|
|
#:use-module (guix grafts)
|
2014-05-18 21:32:57 +02:00
|
|
|
|
#:use-module (guix gexp)
|
2014-02-18 23:45:58 +01:00
|
|
|
|
#:use-module (guix derivations)
|
|
|
|
|
#:use-module (guix packages)
|
|
|
|
|
#:use-module (guix utils)
|
|
|
|
|
#:use-module (guix monads)
|
2015-10-26 21:19:42 +01:00
|
|
|
|
#:use-module (guix records)
|
2014-06-27 00:06:46 +02:00
|
|
|
|
#:use-module (guix profiles)
|
2015-09-10 11:37:36 +02:00
|
|
|
|
#:use-module (guix scripts)
|
2014-02-18 23:45:58 +01:00
|
|
|
|
#:use-module (guix scripts build)
|
2019-02-13 15:27:36 +01:00
|
|
|
|
#:autoload (guix scripts package) (delete-generations
|
|
|
|
|
delete-matching-generations)
|
2015-11-21 13:12:02 +01:00
|
|
|
|
#:use-module (guix graph)
|
2015-10-14 15:48:14 +02:00
|
|
|
|
#:use-module (guix scripts graph)
|
2014-05-18 21:32:57 +02:00
|
|
|
|
#:use-module (guix build utils)
|
2017-11-30 14:38:13 +01:00
|
|
|
|
#:use-module (guix progress)
|
|
|
|
|
#:use-module ((guix build syscalls) #:select (terminal-columns))
|
2014-09-03 10:47:05 +02:00
|
|
|
|
#:use-module (gnu build install)
|
2017-10-04 21:39:20 +02:00
|
|
|
|
#:autoload (gnu build file-systems)
|
|
|
|
|
(find-partition-by-label find-partition-by-uuid)
|
2018-02-27 14:55:43 +01:00
|
|
|
|
#:autoload (gnu build linux-modules)
|
|
|
|
|
(device-module-aliases matching-modules)
|
2018-03-07 10:41:06 +01:00
|
|
|
|
#:use-module (gnu system linux-initrd)
|
2014-05-16 21:56:00 +02:00
|
|
|
|
#:use-module (gnu system)
|
2017-05-15 22:24:18 +02:00
|
|
|
|
#:use-module (gnu bootloader)
|
2015-06-27 16:45:34 +02:00
|
|
|
|
#:use-module (gnu system file-systems)
|
2017-12-18 15:05:55 +01:00
|
|
|
|
#:use-module (gnu system mapped-devices)
|
2015-06-08 15:04:38 +02:00
|
|
|
|
#:use-module (gnu system linux-container)
|
2017-09-12 08:46:05 +02:00
|
|
|
|
#:use-module (gnu system uuid)
|
2014-02-18 23:45:58 +01:00
|
|
|
|
#:use-module (gnu system vm)
|
2015-10-14 15:48:14 +02:00
|
|
|
|
#:use-module (gnu services)
|
2016-01-27 13:45:01 +01:00
|
|
|
|
#:use-module (gnu services shepherd)
|
2016-02-03 21:59:47 +01:00
|
|
|
|
#:use-module (gnu services herd)
|
2014-02-18 23:45:58 +01:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2016-02-03 21:59:47 +01:00
|
|
|
|
#:use-module (srfi srfi-11)
|
2014-11-11 22:27:24 +01:00
|
|
|
|
#:use-module (srfi srfi-19)
|
2014-05-18 21:32:57 +02:00
|
|
|
|
#:use-module (srfi srfi-26)
|
2015-10-26 21:24:26 +01:00
|
|
|
|
#:use-module (srfi srfi-34)
|
|
|
|
|
#:use-module (srfi srfi-35)
|
2014-02-18 23:45:58 +01:00
|
|
|
|
#:use-module (srfi srfi-37)
|
|
|
|
|
#:use-module (ice-9 match)
|
2016-08-20 09:49:42 +02:00
|
|
|
|
#:use-module (rnrs bytevectors)
|
2014-04-05 22:40:16 +02:00
|
|
|
|
#:export (guix-system
|
|
|
|
|
read-operating-system))
|
2014-02-18 23:45:58 +01:00
|
|
|
|
|
2014-07-13 16:13:42 +02:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Operating system declaration.
|
|
|
|
|
;;;
|
|
|
|
|
|
2014-02-18 23:45:58 +01:00
|
|
|
|
(define %user-module
|
|
|
|
|
;; Module in which the machine description file is loaded.
|
2015-05-18 13:49:44 +02:00
|
|
|
|
(make-user-module '((gnu system)
|
|
|
|
|
(gnu services)
|
|
|
|
|
(gnu system shadow))))
|
2014-02-18 23:45:58 +01:00
|
|
|
|
|
|
|
|
|
(define (read-operating-system file)
|
|
|
|
|
"Read the operating-system declaration from FILE and return it."
|
2015-05-18 13:49:44 +02:00
|
|
|
|
(load* file %user-module))
|
2014-02-18 23:45:58 +01:00
|
|
|
|
|
2014-07-13 16:13:42 +02:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Installation.
|
|
|
|
|
;;;
|
|
|
|
|
|
2017-04-15 13:21:39 +02:00
|
|
|
|
(define-syntax-rule (save-load-path-excursion body ...)
|
|
|
|
|
"Save the current values of '%load-path' and '%load-compiled-path', run
|
|
|
|
|
BODY..., and restore them."
|
|
|
|
|
(let ((path %load-path)
|
|
|
|
|
(cpath %load-compiled-path))
|
|
|
|
|
(dynamic-wind
|
|
|
|
|
(const #t)
|
|
|
|
|
(lambda ()
|
|
|
|
|
body ...)
|
|
|
|
|
(lambda ()
|
|
|
|
|
(set! %load-path path)
|
|
|
|
|
(set! %load-compiled-path cpath)))))
|
|
|
|
|
|
|
|
|
|
(define-syntax-rule (save-environment-excursion body ...)
|
|
|
|
|
"Save the current environment variables, run BODY..., and restore them."
|
|
|
|
|
(let ((env (environ)))
|
|
|
|
|
(dynamic-wind
|
|
|
|
|
(const #t)
|
|
|
|
|
(lambda ()
|
|
|
|
|
body ...)
|
|
|
|
|
(lambda ()
|
|
|
|
|
(environ env)))))
|
|
|
|
|
|
2014-07-13 16:13:42 +02:00
|
|
|
|
(define topologically-sorted*
|
|
|
|
|
(store-lift topologically-sorted))
|
|
|
|
|
|
|
|
|
|
|
2017-11-30 14:17:24 +01:00
|
|
|
|
(define* (copy-item item references target
|
2014-07-20 14:25:08 +02:00
|
|
|
|
#:key (log-port (current-error-port)))
|
2017-11-30 14:17:24 +01:00
|
|
|
|
"Copy ITEM to the store under root directory TARGET and register it with
|
|
|
|
|
REFERENCES as its set of references."
|
|
|
|
|
(let ((dest (string-append target item))
|
|
|
|
|
(state (string-append target "/var/guix")))
|
|
|
|
|
(format log-port "copying '~a'...~%" item)
|
|
|
|
|
|
|
|
|
|
;; Remove DEST if it exists to make sure that (1) we do not fail badly
|
|
|
|
|
;; while trying to overwrite it (see <http://bugs.gnu.org/20722>), and
|
|
|
|
|
;; (2) we end up with the right contents.
|
2018-07-03 11:24:32 +02:00
|
|
|
|
(when (false-if-exception (lstat dest))
|
|
|
|
|
(for-each make-file-writable
|
|
|
|
|
(find-files dest (lambda (file stat)
|
|
|
|
|
(eq? 'directory (stat:type stat)))
|
|
|
|
|
#:directories? #t))
|
2017-11-30 14:17:24 +01:00
|
|
|
|
(delete-file-recursively dest))
|
|
|
|
|
|
|
|
|
|
(copy-recursively item dest
|
|
|
|
|
#:log (%make-void-port "w"))
|
|
|
|
|
|
|
|
|
|
;; Register ITEM; as a side-effect, it resets timestamps, etc.
|
|
|
|
|
;; Explicitly use "TARGET/var/guix" as the state directory, to avoid
|
|
|
|
|
;; reproducing the user's current settings; see
|
|
|
|
|
;; <http://bugs.gnu.org/18049>.
|
|
|
|
|
(unless (register-path item
|
|
|
|
|
#:prefix target
|
|
|
|
|
#:state-directory state
|
|
|
|
|
#:references references)
|
|
|
|
|
(leave (G_ "failed to register '~a' under '~a'~%")
|
|
|
|
|
item target))))
|
2014-07-13 16:13:42 +02:00
|
|
|
|
|
2014-07-20 14:25:08 +02:00
|
|
|
|
(define* (copy-closure item target
|
|
|
|
|
#:key (log-port (current-error-port)))
|
|
|
|
|
"Copy ITEM and all its dependencies to the store under root directory
|
|
|
|
|
TARGET, and register them."
|
2017-11-30 14:17:24 +01:00
|
|
|
|
(mlet* %store-monad ((to-copy (topologically-sorted* (list item)))
|
2018-07-02 23:59:52 +02:00
|
|
|
|
(refs (mapm %store-monad references* to-copy))
|
|
|
|
|
(info (mapm %store-monad query-path-info*
|
|
|
|
|
(delete-duplicates
|
|
|
|
|
(append to-copy (concatenate refs)))))
|
|
|
|
|
(size -> (reduce + 0 (map path-info-nar-size info))))
|
2017-11-30 14:38:13 +01:00
|
|
|
|
(define progress-bar
|
|
|
|
|
(progress-reporter/bar (length to-copy)
|
|
|
|
|
(format #f (G_ "copying to '~a'...")
|
|
|
|
|
target)))
|
|
|
|
|
|
2018-07-02 23:59:52 +02:00
|
|
|
|
(check-available-space size target)
|
|
|
|
|
|
2017-11-30 14:38:13 +01:00
|
|
|
|
(call-with-progress-reporter progress-bar
|
|
|
|
|
(lambda (report)
|
|
|
|
|
(let ((void (%make-void-port "w")))
|
|
|
|
|
(for-each (lambda (item refs)
|
|
|
|
|
(copy-item item refs target #:log-port void)
|
|
|
|
|
(report))
|
|
|
|
|
to-copy refs))))
|
2017-11-30 14:17:24 +01:00
|
|
|
|
|
|
|
|
|
(return *unspecified*)))
|
2014-07-20 14:25:08 +02:00
|
|
|
|
|
2018-11-16 09:25:56 +01:00
|
|
|
|
(define* (install-bootloader installer
|
2017-04-02 09:34:01 +02:00
|
|
|
|
#:key
|
|
|
|
|
bootcfg bootcfg-file
|
2017-08-23 21:26:05 +02:00
|
|
|
|
target)
|
2018-11-16 09:25:56 +01:00
|
|
|
|
"Run INSTALLER, a bootloader installation script, with error handling, in
|
|
|
|
|
%STORE-MONAD."
|
|
|
|
|
(mlet %store-monad ((installer-drv (if installer
|
|
|
|
|
(lower-object installer)
|
|
|
|
|
(return #f)))
|
|
|
|
|
(bootcfg (lower-object bootcfg)))
|
2017-04-02 09:34:01 +02:00
|
|
|
|
(let* ((gc-root (string-append target %gc-roots-directory
|
|
|
|
|
"/bootcfg"))
|
|
|
|
|
(temp-gc-root (string-append gc-root ".new"))
|
|
|
|
|
(install (and installer-drv
|
|
|
|
|
(derivation->output-path installer-drv)))
|
|
|
|
|
(bootcfg (derivation->output-path bootcfg)))
|
|
|
|
|
;; Prepare the symlink to bootloader config file to make sure that it's
|
|
|
|
|
;; a GC root when 'installer-drv' completes (being a bit paranoid.)
|
|
|
|
|
(switch-symlinks temp-gc-root bootcfg)
|
|
|
|
|
|
|
|
|
|
(unless (false-if-exception
|
|
|
|
|
(begin
|
|
|
|
|
(install-boot-config bootcfg bootcfg-file target)
|
|
|
|
|
(when install
|
|
|
|
|
(save-load-path-excursion (primitive-load install)))))
|
2014-12-09 11:06:22 +01:00
|
|
|
|
(delete-file temp-gc-root)
|
2017-08-23 21:26:05 +02:00
|
|
|
|
(leave (G_ "failed to install bootloader ~a~%") install))
|
2014-12-04 23:52:28 +01:00
|
|
|
|
|
2017-04-02 09:34:01 +02:00
|
|
|
|
;; Register bootloader config file as a GC root so that its dependencies
|
|
|
|
|
;; (background image, font, etc.) are not reclaimed.
|
|
|
|
|
(rename-file temp-gc-root gc-root)
|
|
|
|
|
(return #t))))
|
2014-12-04 19:14:07 +01:00
|
|
|
|
|
2014-07-13 16:13:42 +02:00
|
|
|
|
(define* (install os-drv target
|
2014-05-19 22:36:15 +02:00
|
|
|
|
#:key (log-port (current-output-port))
|
2017-04-02 09:53:51 +02:00
|
|
|
|
bootloader-installer install-bootloader?
|
2017-08-23 21:26:05 +02:00
|
|
|
|
bootcfg bootcfg-file)
|
2017-04-02 09:53:51 +02:00
|
|
|
|
"Copy the closure of BOOTCFG, which includes the output of OS-DRV, to
|
2015-05-24 17:20:24 +02:00
|
|
|
|
directory TARGET. TARGET must be an absolute directory name since that's what
|
2018-06-08 11:03:31 +02:00
|
|
|
|
'register-path' expects.
|
2014-05-19 22:36:15 +02:00
|
|
|
|
|
2017-08-23 21:26:05 +02:00
|
|
|
|
When INSTALL-BOOTLOADER? is true, install bootloader using BOOTCFG."
|
2014-07-13 16:13:42 +02:00
|
|
|
|
(define (maybe-copy to-copy)
|
|
|
|
|
(with-monad %store-monad
|
|
|
|
|
(if (string=? target "/")
|
|
|
|
|
(begin
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(warning (G_ "initializing the current root file system~%"))
|
2014-07-13 16:13:42 +02:00
|
|
|
|
(return #t))
|
|
|
|
|
(begin
|
|
|
|
|
;; Make sure the target store exists.
|
|
|
|
|
(mkdir-p (string-append target (%store-prefix)))
|
|
|
|
|
|
|
|
|
|
;; Copy items to the new store.
|
2014-07-20 14:25:08 +02:00
|
|
|
|
(copy-closure to-copy target #:log-port log-port)))))
|
2014-07-13 16:13:42 +02:00
|
|
|
|
|
2015-05-23 16:52:17 +02:00
|
|
|
|
;; Make sure TARGET is root-owned when running as root, but still allow
|
|
|
|
|
;; non-root uses (useful for testing.) See
|
|
|
|
|
;; <http://lists.gnu.org/archive/html/guix-devel/2015-05/msg00452.html>.
|
|
|
|
|
(if (zero? (geteuid))
|
|
|
|
|
(chown target 0 0)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(warning (G_ "not running as 'root', so \
|
2015-05-23 16:52:17 +02:00
|
|
|
|
the ownership of '~a' may be incorrect!~%")
|
|
|
|
|
target))
|
|
|
|
|
|
2018-11-11 23:48:53 +01:00
|
|
|
|
;; If a previous installation was attempted, make sure we start anew; in
|
|
|
|
|
;; particular, we don't want to keep a store database that might not
|
|
|
|
|
;; correspond to what we're actually putting in the store.
|
|
|
|
|
(let ((state (string-append target "/var/guix")))
|
|
|
|
|
(when (file-exists? state)
|
|
|
|
|
(delete-file-recursively state)))
|
|
|
|
|
|
2015-05-23 16:52:17 +02:00
|
|
|
|
(chmod target #o755)
|
2014-12-01 23:07:11 +01:00
|
|
|
|
(let ((os-dir (derivation->output-path os-drv))
|
2014-12-07 00:00:42 +01:00
|
|
|
|
(format (lift format %store-monad))
|
|
|
|
|
(populate (lift2 populate-root-file-system %store-monad)))
|
2014-12-01 23:07:11 +01:00
|
|
|
|
|
2018-11-19 09:38:08 +01:00
|
|
|
|
(mlet %store-monad ((bootcfg (lower-object bootcfg)))
|
|
|
|
|
(mbegin %store-monad
|
|
|
|
|
;; Copy the closure of BOOTCFG, which includes OS-DIR,
|
|
|
|
|
;; eventual background image and so on.
|
|
|
|
|
(maybe-copy (derivation->output-path bootcfg))
|
|
|
|
|
|
|
|
|
|
;; Create a bunch of additional files.
|
|
|
|
|
(format log-port "populating '~a'...~%" target)
|
|
|
|
|
(populate os-dir target)
|
|
|
|
|
|
|
|
|
|
(mwhen install-bootloader?
|
|
|
|
|
(install-bootloader bootloader-installer
|
|
|
|
|
#:bootcfg bootcfg
|
|
|
|
|
#:bootcfg-file bootcfg-file
|
|
|
|
|
#:target target))))))
|
2014-05-18 21:32:57 +02:00
|
|
|
|
|
2014-06-27 00:06:46 +02:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Reconfiguration.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define %system-profile
|
|
|
|
|
;; The system profile.
|
|
|
|
|
(string-append %state-directory "/profiles/system"))
|
|
|
|
|
|
2016-08-02 22:57:09 +02:00
|
|
|
|
(define-syntax-rule (with-shepherd-error-handling mbody ...)
|
|
|
|
|
"Catch and report Shepherd errors that arise when binding MBODY, a monadic
|
|
|
|
|
expression in %STORE-MONAD."
|
|
|
|
|
(lambda (store)
|
2016-10-06 22:56:27 +02:00
|
|
|
|
(catch 'system-error
|
|
|
|
|
(lambda ()
|
|
|
|
|
(guard (c ((shepherd-error? c)
|
|
|
|
|
(values (report-shepherd-error c) store)))
|
|
|
|
|
(values (run-with-store store (begin mbody ...))
|
|
|
|
|
store)))
|
|
|
|
|
(lambda (key proc format-string format-args errno . rest)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(warning (G_ "while talking to shepherd: ~a~%")
|
2016-10-06 22:56:27 +02:00
|
|
|
|
(apply format #f format-string format-args))
|
|
|
|
|
(values #f store)))))
|
2016-05-04 16:38:22 +02:00
|
|
|
|
|
|
|
|
|
(define (report-shepherd-error error)
|
|
|
|
|
"Report ERROR, a '&shepherd-error' error condition object."
|
|
|
|
|
(cond ((service-not-found-error? error)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(report-error (G_ "service '~a' could not be found~%")
|
2016-05-04 16:38:22 +02:00
|
|
|
|
(service-not-found-error-service error)))
|
|
|
|
|
((action-not-found-error? error)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(report-error (G_ "service '~a' does not have an action '~a'~%")
|
2016-05-04 16:38:22 +02:00
|
|
|
|
(action-not-found-error-service error)
|
|
|
|
|
(action-not-found-error-action error)))
|
|
|
|
|
((action-exception-error? error)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(report-error (G_ "exception caught while executing '~a' \
|
2016-05-04 16:38:22 +02:00
|
|
|
|
on service '~a':~%")
|
|
|
|
|
(action-exception-error-action error)
|
|
|
|
|
(action-exception-error-service error))
|
|
|
|
|
(print-exception (current-error-port) #f
|
|
|
|
|
(action-exception-error-key error)
|
|
|
|
|
(action-exception-error-arguments error)))
|
|
|
|
|
((unknown-shepherd-error? error)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(report-error (G_ "something went wrong: ~s~%")
|
2016-05-04 16:38:22 +02:00
|
|
|
|
(unknown-shepherd-error-sexp error)))
|
|
|
|
|
((shepherd-error? error)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(report-error (G_ "shepherd error~%")))
|
2016-05-04 16:38:22 +02:00
|
|
|
|
((not error) ;not an error
|
|
|
|
|
#t)))
|
|
|
|
|
|
2016-08-30 22:40:24 +02:00
|
|
|
|
(define (call-with-service-upgrade-info new-services mproc)
|
|
|
|
|
"Call MPROC, a monadic procedure in %STORE-MONAD, passing it the list of
|
|
|
|
|
names of services to load (upgrade), and the list of names of services to
|
|
|
|
|
unload."
|
2016-08-30 17:59:15 +02:00
|
|
|
|
(match (current-services)
|
|
|
|
|
((services ...)
|
2018-08-26 13:54:14 +02:00
|
|
|
|
(let-values (((to-unload to-restart)
|
2016-08-31 15:40:00 +02:00
|
|
|
|
(shepherd-service-upgrade services new-services)))
|
2018-08-26 13:54:14 +02:00
|
|
|
|
(mproc to-restart
|
2016-08-31 12:49:45 +02:00
|
|
|
|
(map (compose first live-service-provision)
|
|
|
|
|
to-unload))))
|
2016-08-30 17:59:15 +02:00
|
|
|
|
(#f
|
|
|
|
|
(with-monad %store-monad
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(warning (G_ "failed to obtain list of shepherd services~%"))
|
2016-08-30 17:59:15 +02:00
|
|
|
|
(return #f)))))
|
2016-05-04 16:38:22 +02:00
|
|
|
|
|
2016-02-03 21:59:47 +01:00
|
|
|
|
(define (upgrade-shepherd-services os)
|
|
|
|
|
"Upgrade the Shepherd (PID 1) by unloading obsolete services and loading new
|
|
|
|
|
services specified in OS and not currently running.
|
|
|
|
|
|
|
|
|
|
This is currently very conservative in that it does not stop or unload any
|
|
|
|
|
running service. Unloading or stopping the wrong service ('udev', say) could
|
|
|
|
|
bring the system down."
|
|
|
|
|
(define new-services
|
2017-04-15 22:12:37 +02:00
|
|
|
|
(service-value
|
2016-02-03 21:59:47 +01:00
|
|
|
|
(fold-services (operating-system-services os)
|
|
|
|
|
#:target-type shepherd-root-service-type)))
|
|
|
|
|
|
2016-05-04 16:38:22 +02:00
|
|
|
|
;; Arrange to simply emit a warning if the service upgrade fails.
|
|
|
|
|
(with-shepherd-error-handling
|
|
|
|
|
(call-with-service-upgrade-info new-services
|
2018-08-26 13:54:14 +02:00
|
|
|
|
(lambda (to-restart to-unload)
|
2016-05-04 16:38:22 +02:00
|
|
|
|
(for-each (lambda (unload)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(info (G_ "unloading service '~a'...~%") unload)
|
2016-05-04 16:38:22 +02:00
|
|
|
|
(unload-service unload))
|
|
|
|
|
to-unload)
|
|
|
|
|
|
|
|
|
|
(with-monad %store-monad
|
2018-08-26 13:54:14 +02:00
|
|
|
|
(munless (null? new-services)
|
|
|
|
|
(let ((new-service-names (map shepherd-service-canonical-name new-services))
|
|
|
|
|
(to-restart-names (map shepherd-service-canonical-name to-restart))
|
|
|
|
|
(to-start (filter shepherd-service-auto-start? new-services)))
|
|
|
|
|
(info (G_ "loading new services:~{ ~a~}...~%") new-service-names)
|
|
|
|
|
(unless (null? to-restart-names)
|
|
|
|
|
;; Listing TO-RESTART-NAMES in the message below wouldn't help
|
|
|
|
|
;; because many essential services cannot be meaningfully
|
|
|
|
|
;; restarted. See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=22039#30>.
|
|
|
|
|
(format #t (G_ "To complete the upgrade, run 'herd restart SERVICE' to stop,
|
|
|
|
|
upgrade, and restart each service that was not automatically restarted.\n")))
|
2018-01-20 23:17:23 +01:00
|
|
|
|
(mlet %store-monad ((files (mapm %store-monad
|
|
|
|
|
(compose lower-object
|
|
|
|
|
shepherd-service-file)
|
2018-08-26 13:54:14 +02:00
|
|
|
|
new-services)))
|
2016-05-04 16:38:22 +02:00
|
|
|
|
;; Here we assume that FILES are exactly those that were computed
|
|
|
|
|
;; as part of the derivation that built OS, which is normally the
|
|
|
|
|
;; case.
|
2018-08-26 13:54:14 +02:00
|
|
|
|
(load-services/safe (map derivation->output-path files))
|
2016-05-04 16:38:22 +02:00
|
|
|
|
|
|
|
|
|
(for-each start-service
|
|
|
|
|
(map shepherd-service-canonical-name to-start))
|
|
|
|
|
(return #t)))))))))
|
2016-02-03 21:59:47 +01:00
|
|
|
|
|
2014-07-13 16:13:42 +02:00
|
|
|
|
(define* (switch-to-system os
|
|
|
|
|
#:optional (profile %system-profile))
|
|
|
|
|
"Make a new generation of PROFILE pointing to the directory of OS, switch to
|
|
|
|
|
it atomically, and then run OS's activation script."
|
2018-06-21 16:54:06 +02:00
|
|
|
|
(mlet* %store-monad ((drv (operating-system-derivation os))
|
|
|
|
|
(script (lower-object (operating-system-activation-script os))))
|
2014-07-13 16:13:42 +02:00
|
|
|
|
(let* ((system (derivation->output-path drv))
|
|
|
|
|
(number (+ 1 (generation-number profile)))
|
|
|
|
|
(generation (generation-file-name profile number)))
|
2016-12-02 10:52:04 +01:00
|
|
|
|
(switch-symlinks generation system)
|
2014-07-13 16:13:42 +02:00
|
|
|
|
(switch-symlinks profile generation)
|
|
|
|
|
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(format #t (G_ "activating system...~%"))
|
2014-07-23 18:17:06 +02:00
|
|
|
|
|
|
|
|
|
;; The activation script may change $PATH, among others, so protect
|
|
|
|
|
;; against that.
|
2016-02-03 21:59:47 +01:00
|
|
|
|
(save-environment-excursion
|
|
|
|
|
;; Tell 'activate-current-system' what the new system is.
|
|
|
|
|
(setenv "GUIX_NEW_SYSTEM" system)
|
2014-09-12 17:41:06 +02:00
|
|
|
|
|
2016-02-25 12:42:01 +01:00
|
|
|
|
;; The activation script may modify '%load-path' & co., so protect
|
|
|
|
|
;; against that. This is necessary to ensure that
|
|
|
|
|
;; 'upgrade-shepherd-services' gets to see the right modules when it
|
2016-07-12 18:00:16 +02:00
|
|
|
|
;; computes derivations with 'gexp->derivation'.
|
2016-02-25 12:42:01 +01:00
|
|
|
|
(save-load-path-excursion
|
|
|
|
|
(primitive-load (derivation->output-path script))))
|
2014-07-13 16:13:42 +02:00
|
|
|
|
|
2016-02-03 21:59:47 +01:00
|
|
|
|
;; Finally, try to update system services.
|
|
|
|
|
(upgrade-shepherd-services os))))
|
2014-06-27 00:06:46 +02:00
|
|
|
|
|
|
|
|
|
(define-syntax-rule (unless-file-not-found exp)
|
|
|
|
|
(catch 'system-error
|
|
|
|
|
(lambda ()
|
|
|
|
|
exp)
|
|
|
|
|
(lambda args
|
|
|
|
|
(if (= ENOENT (system-error-errno args))
|
|
|
|
|
#f
|
|
|
|
|
(apply throw args)))))
|
|
|
|
|
|
2014-11-11 22:27:24 +01:00
|
|
|
|
(define (seconds->string seconds)
|
|
|
|
|
"Return a string representing the date for SECONDS."
|
|
|
|
|
(let ((time (make-time time-utc 0 seconds)))
|
|
|
|
|
(date->string (time-utc->date time)
|
|
|
|
|
"~Y-~m-~d ~H:~M")))
|
|
|
|
|
|
2017-04-15 19:34:00 +02:00
|
|
|
|
(define* (profile-boot-parameters #:optional (profile %system-profile)
|
2018-04-17 09:23:00 +02:00
|
|
|
|
(numbers
|
|
|
|
|
(reverse (generation-numbers profile))))
|
|
|
|
|
"Return a list of 'boot-parameters' for the generations of PROFILE specified
|
|
|
|
|
by NUMBERS, which is a list of generation numbers. The list is ordered from
|
|
|
|
|
the most recent to the oldest profiles."
|
2017-04-15 19:34:00 +02:00
|
|
|
|
(define (system->boot-parameters system number time)
|
|
|
|
|
(unless-file-not-found
|
2017-04-21 14:37:10 +02:00
|
|
|
|
(let* ((params (read-boot-parameters-file system))
|
|
|
|
|
(label (boot-parameters-label params)))
|
|
|
|
|
(boot-parameters
|
|
|
|
|
(inherit params)
|
|
|
|
|
(label (string-append label " (#"
|
|
|
|
|
(number->string number) ", "
|
|
|
|
|
(seconds->string time) ")"))))))
|
2017-04-15 19:34:00 +02:00
|
|
|
|
(let* ((systems (map (cut generation-file-name profile <>)
|
|
|
|
|
numbers))
|
|
|
|
|
(times (map (lambda (system)
|
|
|
|
|
(unless-file-not-found
|
|
|
|
|
(stat:mtime (lstat system))))
|
|
|
|
|
systems)))
|
|
|
|
|
(filter-map system->boot-parameters systems numbers times)))
|
|
|
|
|
|
2016-11-02 06:48:15 +01:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Roll-back.
|
|
|
|
|
;;;
|
|
|
|
|
(define (roll-back-system store)
|
|
|
|
|
"Roll back the system profile to its previous generation. STORE is an open
|
|
|
|
|
connection to the store."
|
|
|
|
|
(switch-to-system-generation store "-1"))
|
2017-10-04 21:39:20 +02:00
|
|
|
|
|
2016-11-02 06:48:15 +01:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Switch generations.
|
|
|
|
|
;;;
|
|
|
|
|
(define (switch-to-system-generation store spec)
|
|
|
|
|
"Switch the system profile to the generation specified by SPEC, and
|
2017-04-02 09:56:08 +02:00
|
|
|
|
re-install bootloader with a configuration file that uses the specified system
|
2016-11-02 06:48:15 +01:00
|
|
|
|
generation as its default entry. STORE is an open connection to the store."
|
|
|
|
|
(let ((number (relative-generation-spec->number %system-profile spec)))
|
|
|
|
|
(if number
|
|
|
|
|
(begin
|
2017-04-02 09:56:08 +02:00
|
|
|
|
(reinstall-bootloader store number)
|
2016-11-02 06:48:15 +01:00
|
|
|
|
(switch-to-generation* %system-profile number))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(leave (G_ "cannot switch to system generation '~a'~%") spec))))
|
2016-11-02 06:48:15 +01:00
|
|
|
|
|
2017-04-02 09:56:08 +02:00
|
|
|
|
(define* (system-bootloader-name #:optional (system %system-profile))
|
|
|
|
|
"Return the bootloader name stored in SYSTEM's \"parameters\" file."
|
|
|
|
|
(let ((params (unless-file-not-found
|
|
|
|
|
(read-boot-parameters-file system))))
|
2017-06-10 10:47:25 +02:00
|
|
|
|
(boot-parameters-bootloader-name params)))
|
2017-04-02 09:56:08 +02:00
|
|
|
|
|
|
|
|
|
(define (reinstall-bootloader store number)
|
|
|
|
|
"Re-install bootloader for existing system profile generation NUMBER.
|
|
|
|
|
STORE is an open connection to the store."
|
2016-11-02 06:48:15 +01:00
|
|
|
|
(let* ((generation (generation-file-name %system-profile number))
|
2017-04-02 09:56:08 +02:00
|
|
|
|
;; Detect the bootloader used in %system-profile.
|
|
|
|
|
(bootloader (lookup-bootloader-by-name (system-bootloader-name)))
|
|
|
|
|
|
|
|
|
|
;; Use the detected bootloader with default configuration.
|
|
|
|
|
;; It will be enough to allow the system to boot.
|
|
|
|
|
(bootloader-config (bootloader-configuration
|
|
|
|
|
(bootloader bootloader)))
|
|
|
|
|
|
2016-11-02 06:48:15 +01:00
|
|
|
|
;; Make the specified system generation the default entry.
|
2017-06-29 12:42:59 +02:00
|
|
|
|
(params (profile-boot-parameters %system-profile (list number)))
|
2019-02-13 15:31:05 +01:00
|
|
|
|
(old-generations
|
|
|
|
|
(delv number (reverse (generation-numbers %system-profile))))
|
2017-06-29 12:42:59 +02:00
|
|
|
|
(old-params (profile-boot-parameters
|
|
|
|
|
%system-profile old-generations))
|
|
|
|
|
(entries (map boot-parameters->menu-entry params))
|
|
|
|
|
(old-entries (map boot-parameters->menu-entry old-params)))
|
2017-04-02 09:56:08 +02:00
|
|
|
|
(run-with-store store
|
|
|
|
|
(mlet* %store-monad
|
2018-12-07 15:12:21 +01:00
|
|
|
|
((bootcfg (lower-object
|
|
|
|
|
((bootloader-configuration-file-generator bootloader)
|
|
|
|
|
bootloader-config entries
|
|
|
|
|
#:old-entries old-entries)))
|
2017-04-02 09:56:08 +02:00
|
|
|
|
(bootcfg-file -> (bootloader-configuration-file bootloader))
|
|
|
|
|
(target -> "/")
|
|
|
|
|
(drvs -> (list bootcfg)))
|
|
|
|
|
(mbegin %store-monad
|
|
|
|
|
(show-what-to-build* drvs)
|
|
|
|
|
(built-derivations drvs)
|
2017-08-23 21:26:05 +02:00
|
|
|
|
;; Only install bootloader configuration file. Thus, no installer is
|
|
|
|
|
;; provided here.
|
2017-04-02 09:56:08 +02:00
|
|
|
|
(install-bootloader #f
|
|
|
|
|
#:bootcfg bootcfg
|
|
|
|
|
#:bootcfg-file bootcfg-file
|
|
|
|
|
#:target target))))))
|
2016-11-02 06:48:15 +01:00
|
|
|
|
|
2015-10-14 15:48:14 +02:00
|
|
|
|
|
|
|
|
|
;;;
|
2015-10-14 19:17:12 +02:00
|
|
|
|
;;; Graphs.
|
2015-10-14 15:48:14 +02:00
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define (service-node-label service)
|
|
|
|
|
"Return a label to represent SERVICE."
|
|
|
|
|
(let ((type (service-kind service))
|
2017-04-15 22:12:37 +02:00
|
|
|
|
(value (service-value service)))
|
2015-10-14 15:48:14 +02:00
|
|
|
|
(string-append (symbol->string (service-type-name type))
|
|
|
|
|
(cond ((or (number? value) (symbol? value))
|
|
|
|
|
(string-append " " (object->string value)))
|
|
|
|
|
((string? value)
|
|
|
|
|
(string-append " " value))
|
|
|
|
|
((file-system? value)
|
|
|
|
|
(string-append " " (file-system-mount-point value)))
|
|
|
|
|
(else
|
|
|
|
|
"")))))
|
|
|
|
|
|
|
|
|
|
(define (service-node-type services)
|
|
|
|
|
"Return a node type for SERVICES. Since <service> instances are not
|
|
|
|
|
self-contained (they express dependencies on service types, not on services),
|
|
|
|
|
we have to create the 'edges' procedure dynamically as a function of the full
|
|
|
|
|
list of services."
|
|
|
|
|
(node-type
|
|
|
|
|
(name "service")
|
|
|
|
|
(description "the DAG of services")
|
|
|
|
|
(identifier (lift1 object-address %store-monad))
|
|
|
|
|
(label service-node-label)
|
|
|
|
|
(edges (lift1 (service-back-edges services) %store-monad))))
|
|
|
|
|
|
2016-01-27 21:06:07 +01:00
|
|
|
|
(define (shepherd-service-node-label service)
|
services: Rename 'dmd' services to 'shepherd'.
* gnu/services/shepherd.scm (dmd-root-service-type, %dmd-root-service)
(dmd-service-type, <dmd-service>, dmd-service, dmd-service?)
(make-dmd-service, dmd-service-documentation, dmd-service-provision)
(dmd-service-requirement, dmd-service-respawn, dmd-service-start)
(dmd-service-stop, dmd-service-auto-start?, dmd-service-modules)
(dmd-service-imported-modules, dmd-service-file-name, dmd-service-file)
(dmd-service-back-edges): Rename to...
(shepherd-root-service-type, %shepherd-root-service, shepherd-service-type)
(<shepherd-service>, shepherd-service, shepherd-service?)
(make-shepherd-service, shepherd-service-documentation)
(shepherd-service-provision, shepherd-service-requirement)
(shepherd-service-respawn, shepherd-service-start)
(shepherd-service-stop, shepherd-service-auto-start?)
(shepherd-service-modules, shepherd-service-imported-modules)
(shepherd-service-file-name, shepherd-service-file)
(shepherd-service-back-edges): ...this
* gnu/services.scm: Adjust comments.
* gnu/services/avahi.scm (avahi-dmd-service): Rename to...
(avahi-shepherd-service): ... this.
* gnu/services/base.scm (%root-file-system-dmd-service)
(file-system->dmd-service-name, mapped-device->dmd-service-name)
(dependency->dmd-service-name, file-system-dmd-service)
(mingetty-dmd-service, nscd-dmd-service, guix-dmd-service)
(guix-publish-dmd-service, udev-dmd-service, gpm-dmd-service): Rename to...
(%root-file-system-shepherd-service)
(file-system->shepherd-service-name, mapped-device->shepherd-service-name)
(dependency->shepherd-service-name, file-system-shepherd-service)
(mingetty-shepherd-service, nscd-shepherd-service, guix-shepherd-service)
(guix-publish-shepherd-service, udev-shepherd-service)
(gpm-shepherd-service): ... this.
* gnu/services/databases.scm (postgresql-dmd-service): Rename to...
(postgresql-shepherd-service): ... this.
* gnu/services/desktop.scm (upower-dmd-service, elogind-dmd-service):
Rename to...
(upower-shepherd-service, elogind-shepherd-service): ... this.
* gnu/services/dbus.scm (dbus-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/lirc.scm (lirc-dmd-service): Rename to...
(lirc-shepherd-service): ... this.
* gnu/services/mail.scm (dovecot-dmd-service): Rename to...
(dovecot-shepherd-service): ... this.
* gnu/services/networking.scm (ntp-dmd-service, tor-dmd-service)
(bitlbee-dmd-service, wicd-dmd-service, network-manager-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/ssh.scm (lsh-dmd-service): Rename to...
(lsh-shepherd-service): ... this.
* gnu/services/web.scm (nginx-dmd-service): Rename to...
(nginx-shepherd-service): ... this.
* gnu/services/xorg.scm (slim-dmd-service): Rename to...
(slim-shepherd-service): ... this.
* gnu/system.scm (essential-services): Use '%shepherd-root-service'.
* gnu/system/install.scm (cow-store-service-type): Adjust accordingly.
* guix/scripts/system.scm (dmd-service-node-label, dmd-service-node-type)
(export-dmd-graph): Likewise.
* tests/guix-system.sh: Likewise.
* tests/services.scm ("dmd-service-back-edges"): Rename to...
("shepherd-service-back-edges"): Adjust accordingly.
* doc/guix.texi: Likewise.
* doc/images/service-graph.dot: Use 'shepherd' service name.
2016-01-27 21:02:31 +01:00
|
|
|
|
"Return a label for a node representing a <shepherd-service>."
|
|
|
|
|
(string-join (map symbol->string (shepherd-service-provision service))))
|
2015-10-14 19:17:12 +02:00
|
|
|
|
|
2016-01-27 21:06:07 +01:00
|
|
|
|
(define (shepherd-service-node-type services)
|
services: Rename 'dmd' services to 'shepherd'.
* gnu/services/shepherd.scm (dmd-root-service-type, %dmd-root-service)
(dmd-service-type, <dmd-service>, dmd-service, dmd-service?)
(make-dmd-service, dmd-service-documentation, dmd-service-provision)
(dmd-service-requirement, dmd-service-respawn, dmd-service-start)
(dmd-service-stop, dmd-service-auto-start?, dmd-service-modules)
(dmd-service-imported-modules, dmd-service-file-name, dmd-service-file)
(dmd-service-back-edges): Rename to...
(shepherd-root-service-type, %shepherd-root-service, shepherd-service-type)
(<shepherd-service>, shepherd-service, shepherd-service?)
(make-shepherd-service, shepherd-service-documentation)
(shepherd-service-provision, shepherd-service-requirement)
(shepherd-service-respawn, shepherd-service-start)
(shepherd-service-stop, shepherd-service-auto-start?)
(shepherd-service-modules, shepherd-service-imported-modules)
(shepherd-service-file-name, shepherd-service-file)
(shepherd-service-back-edges): ...this
* gnu/services.scm: Adjust comments.
* gnu/services/avahi.scm (avahi-dmd-service): Rename to...
(avahi-shepherd-service): ... this.
* gnu/services/base.scm (%root-file-system-dmd-service)
(file-system->dmd-service-name, mapped-device->dmd-service-name)
(dependency->dmd-service-name, file-system-dmd-service)
(mingetty-dmd-service, nscd-dmd-service, guix-dmd-service)
(guix-publish-dmd-service, udev-dmd-service, gpm-dmd-service): Rename to...
(%root-file-system-shepherd-service)
(file-system->shepherd-service-name, mapped-device->shepherd-service-name)
(dependency->shepherd-service-name, file-system-shepherd-service)
(mingetty-shepherd-service, nscd-shepherd-service, guix-shepherd-service)
(guix-publish-shepherd-service, udev-shepherd-service)
(gpm-shepherd-service): ... this.
* gnu/services/databases.scm (postgresql-dmd-service): Rename to...
(postgresql-shepherd-service): ... this.
* gnu/services/desktop.scm (upower-dmd-service, elogind-dmd-service):
Rename to...
(upower-shepherd-service, elogind-shepherd-service): ... this.
* gnu/services/dbus.scm (dbus-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/lirc.scm (lirc-dmd-service): Rename to...
(lirc-shepherd-service): ... this.
* gnu/services/mail.scm (dovecot-dmd-service): Rename to...
(dovecot-shepherd-service): ... this.
* gnu/services/networking.scm (ntp-dmd-service, tor-dmd-service)
(bitlbee-dmd-service, wicd-dmd-service, network-manager-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/ssh.scm (lsh-dmd-service): Rename to...
(lsh-shepherd-service): ... this.
* gnu/services/web.scm (nginx-dmd-service): Rename to...
(nginx-shepherd-service): ... this.
* gnu/services/xorg.scm (slim-dmd-service): Rename to...
(slim-shepherd-service): ... this.
* gnu/system.scm (essential-services): Use '%shepherd-root-service'.
* gnu/system/install.scm (cow-store-service-type): Adjust accordingly.
* guix/scripts/system.scm (dmd-service-node-label, dmd-service-node-type)
(export-dmd-graph): Likewise.
* tests/guix-system.sh: Likewise.
* tests/services.scm ("dmd-service-back-edges"): Rename to...
("shepherd-service-back-edges"): Adjust accordingly.
* doc/guix.texi: Likewise.
* doc/images/service-graph.dot: Use 'shepherd' service name.
2016-01-27 21:02:31 +01:00
|
|
|
|
"Return a node type for SERVICES, a list of <shepherd-service>."
|
2015-10-14 19:17:12 +02:00
|
|
|
|
(node-type
|
2016-01-27 21:06:07 +01:00
|
|
|
|
(name "shepherd-service")
|
|
|
|
|
(description "the dependency graph of shepherd services")
|
|
|
|
|
(identifier (lift1 shepherd-service-node-label %store-monad))
|
|
|
|
|
(label shepherd-service-node-label)
|
services: Rename 'dmd' services to 'shepherd'.
* gnu/services/shepherd.scm (dmd-root-service-type, %dmd-root-service)
(dmd-service-type, <dmd-service>, dmd-service, dmd-service?)
(make-dmd-service, dmd-service-documentation, dmd-service-provision)
(dmd-service-requirement, dmd-service-respawn, dmd-service-start)
(dmd-service-stop, dmd-service-auto-start?, dmd-service-modules)
(dmd-service-imported-modules, dmd-service-file-name, dmd-service-file)
(dmd-service-back-edges): Rename to...
(shepherd-root-service-type, %shepherd-root-service, shepherd-service-type)
(<shepherd-service>, shepherd-service, shepherd-service?)
(make-shepherd-service, shepherd-service-documentation)
(shepherd-service-provision, shepherd-service-requirement)
(shepherd-service-respawn, shepherd-service-start)
(shepherd-service-stop, shepherd-service-auto-start?)
(shepherd-service-modules, shepherd-service-imported-modules)
(shepherd-service-file-name, shepherd-service-file)
(shepherd-service-back-edges): ...this
* gnu/services.scm: Adjust comments.
* gnu/services/avahi.scm (avahi-dmd-service): Rename to...
(avahi-shepherd-service): ... this.
* gnu/services/base.scm (%root-file-system-dmd-service)
(file-system->dmd-service-name, mapped-device->dmd-service-name)
(dependency->dmd-service-name, file-system-dmd-service)
(mingetty-dmd-service, nscd-dmd-service, guix-dmd-service)
(guix-publish-dmd-service, udev-dmd-service, gpm-dmd-service): Rename to...
(%root-file-system-shepherd-service)
(file-system->shepherd-service-name, mapped-device->shepherd-service-name)
(dependency->shepherd-service-name, file-system-shepherd-service)
(mingetty-shepherd-service, nscd-shepherd-service, guix-shepherd-service)
(guix-publish-shepherd-service, udev-shepherd-service)
(gpm-shepherd-service): ... this.
* gnu/services/databases.scm (postgresql-dmd-service): Rename to...
(postgresql-shepherd-service): ... this.
* gnu/services/desktop.scm (upower-dmd-service, elogind-dmd-service):
Rename to...
(upower-shepherd-service, elogind-shepherd-service): ... this.
* gnu/services/dbus.scm (dbus-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/lirc.scm (lirc-dmd-service): Rename to...
(lirc-shepherd-service): ... this.
* gnu/services/mail.scm (dovecot-dmd-service): Rename to...
(dovecot-shepherd-service): ... this.
* gnu/services/networking.scm (ntp-dmd-service, tor-dmd-service)
(bitlbee-dmd-service, wicd-dmd-service, network-manager-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/ssh.scm (lsh-dmd-service): Rename to...
(lsh-shepherd-service): ... this.
* gnu/services/web.scm (nginx-dmd-service): Rename to...
(nginx-shepherd-service): ... this.
* gnu/services/xorg.scm (slim-dmd-service): Rename to...
(slim-shepherd-service): ... this.
* gnu/system.scm (essential-services): Use '%shepherd-root-service'.
* gnu/system/install.scm (cow-store-service-type): Adjust accordingly.
* guix/scripts/system.scm (dmd-service-node-label, dmd-service-node-type)
(export-dmd-graph): Likewise.
* tests/guix-system.sh: Likewise.
* tests/services.scm ("dmd-service-back-edges"): Rename to...
("shepherd-service-back-edges"): Adjust accordingly.
* doc/guix.texi: Likewise.
* doc/images/service-graph.dot: Use 'shepherd' service name.
2016-01-27 21:02:31 +01:00
|
|
|
|
(edges (lift1 (shepherd-service-back-edges services) %store-monad))))
|
2015-10-14 15:48:14 +02:00
|
|
|
|
|
2015-10-26 21:24:26 +01:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Generations.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define* (display-system-generation number
|
|
|
|
|
#:optional (profile %system-profile))
|
|
|
|
|
"Display a summary of system generation NUMBER in a human-readable format."
|
|
|
|
|
(unless (zero? number)
|
2016-08-20 09:49:42 +02:00
|
|
|
|
(let* ((generation (generation-file-name profile number))
|
2017-04-21 14:37:09 +02:00
|
|
|
|
(params (read-boot-parameters-file generation))
|
2016-08-20 09:49:42 +02:00
|
|
|
|
(label (boot-parameters-label params))
|
2017-06-10 10:47:25 +02:00
|
|
|
|
(bootloader-name (boot-parameters-bootloader-name params))
|
2016-08-20 09:49:42 +02:00
|
|
|
|
(root (boot-parameters-root-device params))
|
|
|
|
|
(root-device (if (bytevector? root)
|
|
|
|
|
(uuid->string root)
|
|
|
|
|
root))
|
|
|
|
|
(kernel (boot-parameters-kernel params)))
|
2015-10-26 21:24:26 +01:00
|
|
|
|
(display-generation profile number)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(format #t (G_ " file name: ~a~%") generation)
|
|
|
|
|
(format #t (G_ " canonical file name: ~a~%") (readlink* generation))
|
2016-01-08 00:48:17 +01:00
|
|
|
|
;; TRANSLATORS: Please preserve the two-space indentation.
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(format #t (G_ " label: ~a~%") label)
|
2017-06-10 10:47:25 +02:00
|
|
|
|
(format #t (G_ " bootloader: ~a~%") bootloader-name)
|
2018-06-20 15:19:52 +02:00
|
|
|
|
|
|
|
|
|
;; TRANSLATORS: The '~[', '~;', and '~]' sequences in this string must
|
|
|
|
|
;; be preserved. They denote conditionals, such that the result will
|
|
|
|
|
;; look like:
|
|
|
|
|
;; root device: UUID: 12345-678
|
|
|
|
|
;; or:
|
|
|
|
|
;; root device: label: "my-root"
|
|
|
|
|
;; or just:
|
|
|
|
|
;; root device: /dev/sda3
|
|
|
|
|
(format #t (G_ " root device: ~[UUID: ~a~;label: ~s~;~a~]~%")
|
|
|
|
|
(cond ((uuid? root-device) 0)
|
|
|
|
|
((file-system-label? root-device) 1)
|
|
|
|
|
(else 2))
|
|
|
|
|
(cond ((uuid? root-device)
|
|
|
|
|
(uuid->string root-device))
|
|
|
|
|
((file-system-label? root-device)
|
|
|
|
|
(file-system-label->string root-device))
|
|
|
|
|
(else
|
|
|
|
|
root-device)))
|
|
|
|
|
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(format #t (G_ " kernel: ~a~%") kernel))))
|
2015-10-26 21:24:26 +01:00
|
|
|
|
|
|
|
|
|
(define* (list-generations pattern #:optional (profile %system-profile))
|
|
|
|
|
"Display in a human-readable format all the system generations matching
|
|
|
|
|
PATTERN, a string. When PATTERN is #f, display all the system generations."
|
|
|
|
|
(cond ((not (file-exists? profile)) ; XXX: race condition
|
|
|
|
|
(raise (condition (&profile-not-found-error
|
|
|
|
|
(profile profile)))))
|
|
|
|
|
((string-null? pattern)
|
|
|
|
|
(for-each display-system-generation (profile-generations profile)))
|
|
|
|
|
((matching-generations pattern profile)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (numbers)
|
|
|
|
|
(if (null-list? numbers)
|
|
|
|
|
(exit 1)
|
|
|
|
|
(leave-on-EPIPE
|
|
|
|
|
(for-each display-system-generation numbers)))))
|
|
|
|
|
(else
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(leave (G_ "invalid syntax: ~a~%") pattern))))
|
2015-10-26 21:24:26 +01:00
|
|
|
|
|
2017-10-04 21:39:20 +02:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; File system declaration checks.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define (check-file-system-availability file-systems)
|
|
|
|
|
"Check whether the UUIDs or partition labels that FILE-SYSTEMS refer to, if
|
|
|
|
|
any, are available. Raise an error if they're not."
|
|
|
|
|
(define relevant
|
|
|
|
|
(filter (lambda (fs)
|
|
|
|
|
(and (file-system-mount? fs)
|
2018-04-27 15:31:37 +02:00
|
|
|
|
(not (member (file-system-type fs)
|
|
|
|
|
%pseudo-file-system-types))
|
2017-10-04 21:39:20 +02:00
|
|
|
|
(not (memq 'bind-mount (file-system-flags fs)))))
|
|
|
|
|
file-systems))
|
|
|
|
|
|
|
|
|
|
(define labeled
|
|
|
|
|
(filter (lambda (fs)
|
2018-05-18 13:43:07 +02:00
|
|
|
|
(file-system-label? (file-system-device fs)))
|
2017-10-04 21:39:20 +02:00
|
|
|
|
relevant))
|
|
|
|
|
|
2018-04-27 15:31:37 +02:00
|
|
|
|
(define literal
|
|
|
|
|
(filter (lambda (fs)
|
2018-05-18 13:43:07 +02:00
|
|
|
|
(string? (file-system-device fs)))
|
2018-04-27 15:31:37 +02:00
|
|
|
|
relevant))
|
|
|
|
|
|
2017-10-04 21:39:20 +02:00
|
|
|
|
(define uuid
|
|
|
|
|
(filter (lambda (fs)
|
2018-05-18 13:43:07 +02:00
|
|
|
|
(uuid? (file-system-device fs)))
|
2017-10-04 21:39:20 +02:00
|
|
|
|
relevant))
|
|
|
|
|
|
|
|
|
|
(define fail? #f)
|
|
|
|
|
|
|
|
|
|
(define (file-system-location* fs)
|
|
|
|
|
(location->string
|
|
|
|
|
(source-properties->location
|
|
|
|
|
(file-system-location fs))))
|
|
|
|
|
|
|
|
|
|
(let-syntax ((error (syntax-rules ()
|
|
|
|
|
((_ args ...)
|
|
|
|
|
(begin
|
|
|
|
|
(set! fail? #t)
|
|
|
|
|
(format (current-error-port)
|
|
|
|
|
args ...))))))
|
2018-04-27 15:31:37 +02:00
|
|
|
|
(for-each (lambda (fs)
|
|
|
|
|
(catch 'system-error
|
|
|
|
|
(lambda ()
|
|
|
|
|
(stat (file-system-device fs)))
|
|
|
|
|
(lambda args
|
|
|
|
|
(let ((errno (system-error-errno args))
|
|
|
|
|
(device (file-system-device fs)))
|
|
|
|
|
(error (G_ "~a: error: device '~a' not found: ~a~%")
|
|
|
|
|
(file-system-location* fs) device
|
|
|
|
|
(strerror errno))
|
|
|
|
|
(unless (string-prefix? "/" device)
|
|
|
|
|
(display-hint (format #f (G_ "If '~a' is a file system
|
2018-05-18 13:43:07 +02:00
|
|
|
|
label, write @code{(file-system-label ~s)} in your @code{device} field.")
|
|
|
|
|
device device)))))))
|
2018-04-27 15:31:37 +02:00
|
|
|
|
literal)
|
2017-10-04 21:39:20 +02:00
|
|
|
|
(for-each (lambda (fs)
|
2018-05-18 13:43:07 +02:00
|
|
|
|
(let ((label (file-system-label->string
|
|
|
|
|
(file-system-device fs))))
|
|
|
|
|
(unless (find-partition-by-label label)
|
|
|
|
|
(error (G_ "~a: error: file system with label '~a' not found~%")
|
|
|
|
|
(file-system-location* fs) label))))
|
2017-10-04 21:39:20 +02:00
|
|
|
|
labeled)
|
|
|
|
|
(for-each (lambda (fs)
|
|
|
|
|
(unless (find-partition-by-uuid (file-system-device fs))
|
|
|
|
|
(error (G_ "~a: error: file system with UUID '~a' not found~%")
|
|
|
|
|
(file-system-location* fs)
|
|
|
|
|
(uuid->string (file-system-device fs)))))
|
|
|
|
|
uuid)
|
|
|
|
|
|
|
|
|
|
(when fail?
|
|
|
|
|
;; Better be safe than sorry.
|
|
|
|
|
(exit 1))))
|
|
|
|
|
|
2018-02-27 14:55:43 +01:00
|
|
|
|
(define (check-mapped-devices os)
|
2017-12-18 15:05:55 +01:00
|
|
|
|
"Check that each of MAPPED-DEVICES is valid according to the 'check'
|
|
|
|
|
procedure of its type."
|
2018-02-27 14:55:43 +01:00
|
|
|
|
(define boot-mapped-devices
|
|
|
|
|
(operating-system-boot-mapped-devices os))
|
|
|
|
|
|
|
|
|
|
(define (needed-for-boot? md)
|
|
|
|
|
(memq md boot-mapped-devices))
|
|
|
|
|
|
|
|
|
|
(define initrd-modules
|
|
|
|
|
(operating-system-initrd-modules os))
|
|
|
|
|
|
2017-12-18 15:05:55 +01:00
|
|
|
|
(for-each (lambda (md)
|
|
|
|
|
(let ((check (mapped-device-kind-check
|
|
|
|
|
(mapped-device-type md))))
|
|
|
|
|
;; We expect CHECK to raise an exception with a detailed
|
2018-02-27 14:55:43 +01:00
|
|
|
|
;; '&message' if something goes wrong.
|
|
|
|
|
(check md
|
|
|
|
|
#:needed-for-boot? (needed-for-boot? md)
|
|
|
|
|
#:initrd-modules initrd-modules)))
|
|
|
|
|
(operating-system-mapped-devices os)))
|
|
|
|
|
|
|
|
|
|
(define (check-initrd-modules os)
|
|
|
|
|
"Check that modules needed by 'needed-for-boot' file systems in OS are
|
|
|
|
|
available in the initrd. Note that mapped devices are responsible for
|
|
|
|
|
checking this by themselves in their 'check' procedure."
|
|
|
|
|
(define (file-system-/dev fs)
|
|
|
|
|
(let ((device (file-system-device fs)))
|
2018-05-18 13:43:07 +02:00
|
|
|
|
(match device
|
|
|
|
|
((? string?)
|
|
|
|
|
device)
|
|
|
|
|
((? uuid?)
|
|
|
|
|
(find-partition-by-uuid device))
|
|
|
|
|
((? file-system-label?)
|
|
|
|
|
(find-partition-by-label (file-system-label->string device))))))
|
2018-02-27 14:55:43 +01:00
|
|
|
|
|
|
|
|
|
(define file-systems
|
|
|
|
|
(filter file-system-needed-for-boot?
|
|
|
|
|
(operating-system-file-systems os)))
|
|
|
|
|
|
|
|
|
|
(for-each (lambda (fs)
|
2018-03-07 10:41:06 +01:00
|
|
|
|
(check-device-initrd-modules (file-system-/dev fs)
|
|
|
|
|
(operating-system-initrd-modules os)
|
|
|
|
|
(source-properties->location
|
|
|
|
|
(file-system-location fs))))
|
2018-02-27 14:55:43 +01:00
|
|
|
|
file-systems))
|
2017-12-18 15:05:55 +01:00
|
|
|
|
|
2014-07-13 16:13:42 +02:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Action.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define* (system-derivation-for-action os action
|
2017-07-03 12:34:07 +02:00
|
|
|
|
#:key image-size file-system-type
|
2019-05-10 13:26:16 +02:00
|
|
|
|
full-boot? container-shared-network?
|
|
|
|
|
mappings)
|
2014-07-13 16:13:42 +02:00
|
|
|
|
"Return as a monadic value the derivation for OS according to ACTION."
|
|
|
|
|
(case action
|
|
|
|
|
((build init reconfigure)
|
|
|
|
|
(operating-system-derivation os))
|
2015-06-08 15:04:38 +02:00
|
|
|
|
((container)
|
2019-05-10 13:26:16 +02:00
|
|
|
|
(container-script
|
|
|
|
|
os
|
|
|
|
|
#:mappings mappings
|
|
|
|
|
#:shared-network? container-shared-network?))
|
2014-07-13 16:13:42 +02:00
|
|
|
|
((vm-image)
|
|
|
|
|
(system-qemu-image os #:disk-image-size image-size))
|
|
|
|
|
((vm)
|
2014-11-08 14:49:13 +01:00
|
|
|
|
(system-qemu-image/shared-store-script os
|
|
|
|
|
#:full-boot? full-boot?
|
2016-04-28 23:04:52 +02:00
|
|
|
|
#:disk-image-size
|
|
|
|
|
(if full-boot?
|
|
|
|
|
image-size
|
2017-05-21 01:25:16 +02:00
|
|
|
|
(* 70 (expt 2 20)))
|
2014-11-21 00:02:26 +01:00
|
|
|
|
#:mappings mappings))
|
2014-07-13 16:13:42 +02:00
|
|
|
|
((disk-image)
|
2017-07-18 21:39:56 +02:00
|
|
|
|
(system-disk-image os
|
|
|
|
|
#:name (match file-system-type
|
|
|
|
|
("iso9660" "image.iso")
|
|
|
|
|
(_ "disk-image"))
|
|
|
|
|
#:disk-image-size image-size
|
2018-02-19 05:45:03 +01:00
|
|
|
|
#:file-system-type file-system-type))
|
|
|
|
|
((docker-image)
|
|
|
|
|
(system-docker-image os #:register-closures? #t))))
|
2014-07-13 16:13:42 +02:00
|
|
|
|
|
2016-03-28 22:49:42 +02:00
|
|
|
|
(define (maybe-suggest-running-guix-pull)
|
|
|
|
|
"Suggest running 'guix pull' if this has never been done before."
|
|
|
|
|
;; The reason for this is that the 'guix' binding that we see here comes
|
|
|
|
|
;; from either ~/.config/latest or, if it's missing, from the
|
|
|
|
|
;; globally-installed Guix, which is necessarily older. See
|
|
|
|
|
;; <http://lists.gnu.org/archive/html/guix-devel/2014-08/msg00057.html> for
|
|
|
|
|
;; a discussion.
|
|
|
|
|
(define latest
|
2018-05-30 17:50:21 +02:00
|
|
|
|
(string-append (config-directory) "/current"))
|
2016-03-28 22:49:42 +02:00
|
|
|
|
|
|
|
|
|
(unless (file-exists? latest)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(warning (G_ "~a not found: 'guix pull' was never run~%") latest)
|
|
|
|
|
(warning (G_ "Consider running 'guix pull' before 'reconfigure'.~%"))
|
|
|
|
|
(warning (G_ "Failing to do that may downgrade your system!~%"))))
|
2016-03-28 22:49:42 +02:00
|
|
|
|
|
2018-11-16 09:25:56 +01:00
|
|
|
|
(define (bootloader-installer-script installer
|
|
|
|
|
bootloader device target)
|
2017-04-02 09:34:01 +02:00
|
|
|
|
"Return a file calling INSTALLER gexp with given BOOTLOADER, DEVICE
|
|
|
|
|
and TARGET arguments."
|
2018-11-16 09:25:56 +01:00
|
|
|
|
(scheme-file "bootloader-installer"
|
|
|
|
|
(with-imported-modules '((gnu build bootloader)
|
|
|
|
|
(guix build utils))
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (gnu build bootloader)
|
|
|
|
|
(guix build utils)
|
2019-03-16 17:09:19 +01:00
|
|
|
|
(ice-9 binary-ports)
|
|
|
|
|
(srfi srfi-34)
|
|
|
|
|
(srfi srfi-35))
|
|
|
|
|
|
|
|
|
|
(guard (c ((message-condition? c) ;XXX: i18n
|
|
|
|
|
(format (current-error-port) "error: ~a~%"
|
|
|
|
|
(condition-message c))
|
|
|
|
|
(exit 1)))
|
|
|
|
|
(#$installer #$bootloader #$device #$target)
|
|
|
|
|
(format #t "bootloader successfully installed on '~a'~%"
|
2019-03-17 16:22:43 +01:00
|
|
|
|
#$device))))))
|
2017-04-02 09:34:01 +02:00
|
|
|
|
|
2014-07-13 16:13:42 +02:00
|
|
|
|
(define* (perform-action action os
|
2018-03-15 10:28:22 +01:00
|
|
|
|
#:key skip-safety-checks?
|
|
|
|
|
install-bootloader?
|
2017-04-02 09:53:51 +02:00
|
|
|
|
dry-run? derivations-only?
|
2017-08-23 21:48:58 +02:00
|
|
|
|
use-substitutes? bootloader-target target
|
2017-07-03 12:34:07 +02:00
|
|
|
|
image-size file-system-type full-boot?
|
2019-05-10 13:26:16 +02:00
|
|
|
|
container-shared-network?
|
2017-04-04 08:49:22 +02:00
|
|
|
|
(mappings '())
|
|
|
|
|
(gc-root #f))
|
2017-04-02 09:53:51 +02:00
|
|
|
|
"Perform ACTION for OS. INSTALL-BOOTLOADER? specifies whether to install
|
2017-08-23 21:48:58 +02:00
|
|
|
|
bootloader; BOOTLOADER-TAGET is the target for the bootloader; TARGET is the
|
|
|
|
|
target root directory; IMAGE-SIZE is the size of the image to be built, for
|
2018-01-19 16:25:13 +01:00
|
|
|
|
the 'vm-image' and 'disk-image' actions. The root file system is created as a
|
|
|
|
|
FILE-SYSTEM-TYPE file system. FULL-BOOT? is used for the 'vm' action; it
|
2017-08-23 21:48:58 +02:00
|
|
|
|
determines whether to boot directly to the kernel or to the bootloader.
|
2019-05-10 13:26:16 +02:00
|
|
|
|
CONTAINER-SHARED-NETWORK? determines if the container will use a separate
|
|
|
|
|
network namespace.
|
2015-09-19 11:14:42 +02:00
|
|
|
|
|
|
|
|
|
When DERIVATIONS-ONLY? is true, print the derivation file name(s) without
|
2017-04-04 08:49:22 +02:00
|
|
|
|
building anything.
|
|
|
|
|
|
|
|
|
|
When GC-ROOT is a path, also make that path an indirect root of the build
|
2018-03-15 10:28:22 +01:00
|
|
|
|
output when building a system derivation, such as a disk image.
|
|
|
|
|
|
|
|
|
|
When SKIP-SAFETY-CHECKS? is true, skip the file system and initrd module
|
|
|
|
|
static checks."
|
2015-09-19 11:14:42 +02:00
|
|
|
|
(define println
|
|
|
|
|
(cut format #t "~a~%" <>))
|
|
|
|
|
|
2018-11-16 10:12:10 +01:00
|
|
|
|
(define menu-entries
|
|
|
|
|
(if (eq? 'init action)
|
|
|
|
|
'()
|
|
|
|
|
(map boot-parameters->menu-entry (profile-boot-parameters))))
|
|
|
|
|
|
|
|
|
|
(define bootloader
|
|
|
|
|
(bootloader-configuration-bootloader (operating-system-bootloader os)))
|
|
|
|
|
|
|
|
|
|
(define bootcfg
|
2019-04-23 23:39:07 +02:00
|
|
|
|
(and (memq action '(init reconfigure))
|
2018-11-16 10:12:10 +01:00
|
|
|
|
(operating-system-bootcfg os menu-entries)))
|
|
|
|
|
|
|
|
|
|
(define bootloader-script
|
|
|
|
|
(let ((installer (bootloader-installer bootloader))
|
|
|
|
|
(target (or target "/")))
|
|
|
|
|
(bootloader-installer-script installer
|
|
|
|
|
(bootloader-package bootloader)
|
|
|
|
|
bootloader-target target)))
|
|
|
|
|
|
2016-03-28 22:49:42 +02:00
|
|
|
|
(when (eq? action 'reconfigure)
|
|
|
|
|
(maybe-suggest-running-guix-pull))
|
|
|
|
|
|
2017-10-04 21:39:20 +02:00
|
|
|
|
;; Check whether the declared file systems exist. This is better than
|
|
|
|
|
;; instantiating a broken configuration. Assume that we can only check if
|
|
|
|
|
;; running as root.
|
2018-03-15 10:28:22 +01:00
|
|
|
|
(when (and (not skip-safety-checks?)
|
|
|
|
|
(memq action '(init reconfigure)))
|
2018-02-27 14:55:43 +01:00
|
|
|
|
(check-mapped-devices os)
|
2017-12-18 15:05:55 +01:00
|
|
|
|
(when (zero? (getuid))
|
2018-02-27 14:55:43 +01:00
|
|
|
|
(check-file-system-availability (operating-system-file-systems os))
|
|
|
|
|
(check-initrd-modules os)))
|
2017-10-04 21:39:20 +02:00
|
|
|
|
|
2014-07-13 16:13:42 +02:00
|
|
|
|
(mlet* %store-monad
|
|
|
|
|
((sys (system-derivation-for-action os action
|
2017-07-03 12:34:07 +02:00
|
|
|
|
#:file-system-type file-system-type
|
2014-11-07 22:43:33 +01:00
|
|
|
|
#:image-size image-size
|
2014-11-21 00:02:26 +01:00
|
|
|
|
#:full-boot? full-boot?
|
2019-05-10 13:26:16 +02:00
|
|
|
|
#:container-shared-network? container-shared-network?
|
2014-11-21 00:02:26 +01:00
|
|
|
|
#:mappings mappings))
|
2017-04-02 09:34:01 +02:00
|
|
|
|
|
|
|
|
|
;; For 'init' and 'reconfigure', always build BOOTCFG, even if
|
|
|
|
|
;; --no-bootloader is passed, because we then use it as a GC root.
|
|
|
|
|
;; See <http://bugs.gnu.org/21068>.
|
2018-11-16 09:25:56 +01:00
|
|
|
|
(drvs (mapm %store-monad lower-object
|
|
|
|
|
(if (memq action '(init reconfigure))
|
|
|
|
|
(if install-bootloader?
|
2018-11-16 10:12:10 +01:00
|
|
|
|
(list sys bootcfg bootloader-script)
|
2018-11-16 09:25:56 +01:00
|
|
|
|
(list sys bootcfg))
|
|
|
|
|
(list sys))))
|
2015-09-19 11:14:42 +02:00
|
|
|
|
(% (if derivations-only?
|
|
|
|
|
(return (for-each (compose println derivation-file-name)
|
|
|
|
|
drvs))
|
|
|
|
|
(maybe-build drvs #:dry-run? dry-run?
|
|
|
|
|
#:use-substitutes? use-substitutes?))))
|
2014-07-13 16:13:42 +02:00
|
|
|
|
|
2015-09-19 11:14:42 +02:00
|
|
|
|
(if (or dry-run? derivations-only?)
|
2014-07-13 16:13:42 +02:00
|
|
|
|
(return #f)
|
2018-11-16 10:12:10 +01:00
|
|
|
|
(let ((bootcfg-file (bootloader-configuration-file bootloader)))
|
2015-09-19 11:14:42 +02:00
|
|
|
|
(for-each (compose println derivation->output-path)
|
|
|
|
|
drvs)
|
2014-07-13 16:13:42 +02:00
|
|
|
|
|
|
|
|
|
(case action
|
|
|
|
|
((reconfigure)
|
2014-12-04 19:14:07 +01:00
|
|
|
|
(mbegin %store-monad
|
|
|
|
|
(switch-to-system os)
|
2017-04-02 09:53:51 +02:00
|
|
|
|
(mwhen install-bootloader?
|
2018-11-16 10:12:10 +01:00
|
|
|
|
(install-bootloader bootloader-script
|
2017-04-02 09:34:01 +02:00
|
|
|
|
#:bootcfg bootcfg
|
|
|
|
|
#:bootcfg-file bootcfg-file
|
|
|
|
|
#:target "/"))))
|
2014-07-13 16:13:42 +02:00
|
|
|
|
((init)
|
|
|
|
|
(newline)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(format #t (G_ "initializing operating system under '~a'...~%")
|
2014-07-13 16:13:42 +02:00
|
|
|
|
target)
|
|
|
|
|
(install sys (canonicalize-path target)
|
2017-04-02 09:53:51 +02:00
|
|
|
|
#:install-bootloader? install-bootloader?
|
|
|
|
|
#:bootcfg bootcfg
|
|
|
|
|
#:bootcfg-file bootcfg-file
|
2018-11-21 13:56:31 +01:00
|
|
|
|
#:bootloader-installer bootloader-script))
|
2014-07-13 16:13:42 +02:00
|
|
|
|
(else
|
2017-04-04 08:49:22 +02:00
|
|
|
|
;; All we had to do was to build SYS and maybe register an
|
|
|
|
|
;; indirect GC root.
|
|
|
|
|
(let ((output (derivation->output-path sys)))
|
|
|
|
|
(mbegin %store-monad
|
|
|
|
|
(mwhen gc-root
|
|
|
|
|
(register-root* (list output) gc-root))
|
|
|
|
|
(return output)))))))))
|
2014-07-13 16:13:42 +02:00
|
|
|
|
|
2015-10-14 15:48:14 +02:00
|
|
|
|
(define (export-extension-graph os port)
|
|
|
|
|
"Export the service extension graph of OS to PORT."
|
|
|
|
|
(let* ((services (operating-system-services os))
|
2015-11-02 18:44:17 +01:00
|
|
|
|
(system (find (lambda (service)
|
|
|
|
|
(eq? (service-kind service) system-service-type))
|
2015-10-14 15:48:14 +02:00
|
|
|
|
services)))
|
2015-11-02 18:44:17 +01:00
|
|
|
|
(export-graph (list system) (current-output-port)
|
2015-10-14 15:48:14 +02:00
|
|
|
|
#:node-type (service-node-type services)
|
|
|
|
|
#:reverse-edges? #t)))
|
|
|
|
|
|
2016-01-27 21:06:07 +01:00
|
|
|
|
(define (export-shepherd-graph os port)
|
services: Rename 'dmd' services to 'shepherd'.
* gnu/services/shepherd.scm (dmd-root-service-type, %dmd-root-service)
(dmd-service-type, <dmd-service>, dmd-service, dmd-service?)
(make-dmd-service, dmd-service-documentation, dmd-service-provision)
(dmd-service-requirement, dmd-service-respawn, dmd-service-start)
(dmd-service-stop, dmd-service-auto-start?, dmd-service-modules)
(dmd-service-imported-modules, dmd-service-file-name, dmd-service-file)
(dmd-service-back-edges): Rename to...
(shepherd-root-service-type, %shepherd-root-service, shepherd-service-type)
(<shepherd-service>, shepherd-service, shepherd-service?)
(make-shepherd-service, shepherd-service-documentation)
(shepherd-service-provision, shepherd-service-requirement)
(shepherd-service-respawn, shepherd-service-start)
(shepherd-service-stop, shepherd-service-auto-start?)
(shepherd-service-modules, shepherd-service-imported-modules)
(shepherd-service-file-name, shepherd-service-file)
(shepherd-service-back-edges): ...this
* gnu/services.scm: Adjust comments.
* gnu/services/avahi.scm (avahi-dmd-service): Rename to...
(avahi-shepherd-service): ... this.
* gnu/services/base.scm (%root-file-system-dmd-service)
(file-system->dmd-service-name, mapped-device->dmd-service-name)
(dependency->dmd-service-name, file-system-dmd-service)
(mingetty-dmd-service, nscd-dmd-service, guix-dmd-service)
(guix-publish-dmd-service, udev-dmd-service, gpm-dmd-service): Rename to...
(%root-file-system-shepherd-service)
(file-system->shepherd-service-name, mapped-device->shepherd-service-name)
(dependency->shepherd-service-name, file-system-shepherd-service)
(mingetty-shepherd-service, nscd-shepherd-service, guix-shepherd-service)
(guix-publish-shepherd-service, udev-shepherd-service)
(gpm-shepherd-service): ... this.
* gnu/services/databases.scm (postgresql-dmd-service): Rename to...
(postgresql-shepherd-service): ... this.
* gnu/services/desktop.scm (upower-dmd-service, elogind-dmd-service):
Rename to...
(upower-shepherd-service, elogind-shepherd-service): ... this.
* gnu/services/dbus.scm (dbus-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/lirc.scm (lirc-dmd-service): Rename to...
(lirc-shepherd-service): ... this.
* gnu/services/mail.scm (dovecot-dmd-service): Rename to...
(dovecot-shepherd-service): ... this.
* gnu/services/networking.scm (ntp-dmd-service, tor-dmd-service)
(bitlbee-dmd-service, wicd-dmd-service, network-manager-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/ssh.scm (lsh-dmd-service): Rename to...
(lsh-shepherd-service): ... this.
* gnu/services/web.scm (nginx-dmd-service): Rename to...
(nginx-shepherd-service): ... this.
* gnu/services/xorg.scm (slim-dmd-service): Rename to...
(slim-shepherd-service): ... this.
* gnu/system.scm (essential-services): Use '%shepherd-root-service'.
* gnu/system/install.scm (cow-store-service-type): Adjust accordingly.
* guix/scripts/system.scm (dmd-service-node-label, dmd-service-node-type)
(export-dmd-graph): Likewise.
* tests/guix-system.sh: Likewise.
* tests/services.scm ("dmd-service-back-edges"): Rename to...
("shepherd-service-back-edges"): Adjust accordingly.
* doc/guix.texi: Likewise.
* doc/images/service-graph.dot: Use 'shepherd' service name.
2016-01-27 21:02:31 +01:00
|
|
|
|
"Export the graph of shepherd services of OS to PORT."
|
|
|
|
|
(let* ((services (operating-system-services os))
|
|
|
|
|
(pid1 (fold-services services
|
|
|
|
|
#:target-type shepherd-root-service-type))
|
2017-04-15 22:12:37 +02:00
|
|
|
|
(shepherds (service-value pid1)) ;list of <shepherd-service>
|
services: Rename 'dmd' services to 'shepherd'.
* gnu/services/shepherd.scm (dmd-root-service-type, %dmd-root-service)
(dmd-service-type, <dmd-service>, dmd-service, dmd-service?)
(make-dmd-service, dmd-service-documentation, dmd-service-provision)
(dmd-service-requirement, dmd-service-respawn, dmd-service-start)
(dmd-service-stop, dmd-service-auto-start?, dmd-service-modules)
(dmd-service-imported-modules, dmd-service-file-name, dmd-service-file)
(dmd-service-back-edges): Rename to...
(shepherd-root-service-type, %shepherd-root-service, shepherd-service-type)
(<shepherd-service>, shepherd-service, shepherd-service?)
(make-shepherd-service, shepherd-service-documentation)
(shepherd-service-provision, shepherd-service-requirement)
(shepherd-service-respawn, shepherd-service-start)
(shepherd-service-stop, shepherd-service-auto-start?)
(shepherd-service-modules, shepherd-service-imported-modules)
(shepherd-service-file-name, shepherd-service-file)
(shepherd-service-back-edges): ...this
* gnu/services.scm: Adjust comments.
* gnu/services/avahi.scm (avahi-dmd-service): Rename to...
(avahi-shepherd-service): ... this.
* gnu/services/base.scm (%root-file-system-dmd-service)
(file-system->dmd-service-name, mapped-device->dmd-service-name)
(dependency->dmd-service-name, file-system-dmd-service)
(mingetty-dmd-service, nscd-dmd-service, guix-dmd-service)
(guix-publish-dmd-service, udev-dmd-service, gpm-dmd-service): Rename to...
(%root-file-system-shepherd-service)
(file-system->shepherd-service-name, mapped-device->shepherd-service-name)
(dependency->shepherd-service-name, file-system-shepherd-service)
(mingetty-shepherd-service, nscd-shepherd-service, guix-shepherd-service)
(guix-publish-shepherd-service, udev-shepherd-service)
(gpm-shepherd-service): ... this.
* gnu/services/databases.scm (postgresql-dmd-service): Rename to...
(postgresql-shepherd-service): ... this.
* gnu/services/desktop.scm (upower-dmd-service, elogind-dmd-service):
Rename to...
(upower-shepherd-service, elogind-shepherd-service): ... this.
* gnu/services/dbus.scm (dbus-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/lirc.scm (lirc-dmd-service): Rename to...
(lirc-shepherd-service): ... this.
* gnu/services/mail.scm (dovecot-dmd-service): Rename to...
(dovecot-shepherd-service): ... this.
* gnu/services/networking.scm (ntp-dmd-service, tor-dmd-service)
(bitlbee-dmd-service, wicd-dmd-service, network-manager-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/ssh.scm (lsh-dmd-service): Rename to...
(lsh-shepherd-service): ... this.
* gnu/services/web.scm (nginx-dmd-service): Rename to...
(nginx-shepherd-service): ... this.
* gnu/services/xorg.scm (slim-dmd-service): Rename to...
(slim-shepherd-service): ... this.
* gnu/system.scm (essential-services): Use '%shepherd-root-service'.
* gnu/system/install.scm (cow-store-service-type): Adjust accordingly.
* guix/scripts/system.scm (dmd-service-node-label, dmd-service-node-type)
(export-dmd-graph): Likewise.
* tests/guix-system.sh: Likewise.
* tests/services.scm ("dmd-service-back-edges"): Rename to...
("shepherd-service-back-edges"): Adjust accordingly.
* doc/guix.texi: Likewise.
* doc/images/service-graph.dot: Use 'shepherd' service name.
2016-01-27 21:02:31 +01:00
|
|
|
|
(sinks (filter (lambda (service)
|
|
|
|
|
(null? (shepherd-service-requirement service)))
|
|
|
|
|
shepherds)))
|
2015-10-14 19:17:12 +02:00
|
|
|
|
(export-graph sinks (current-output-port)
|
2016-01-27 21:06:07 +01:00
|
|
|
|
#:node-type (shepherd-service-node-type shepherds)
|
2015-10-14 19:17:12 +02:00
|
|
|
|
#:reverse-edges? #t)))
|
|
|
|
|
|
2014-02-18 23:45:58 +01:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Options.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define (show-help)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "Usage: guix system [OPTION ...] ACTION [ARG ...] [FILE]
|
2016-11-02 06:48:15 +01:00
|
|
|
|
Build the operating system declared in FILE according to ACTION.
|
|
|
|
|
Some ACTIONS support additional ARGS.\n"))
|
2014-05-16 21:56:00 +02:00
|
|
|
|
(newline)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "The valid values for ACTION are:\n"))
|
2015-06-07 10:46:06 +02:00
|
|
|
|
(newline)
|
2017-09-13 16:07:30 +02:00
|
|
|
|
(display (G_ "\
|
|
|
|
|
search search for existing service types\n"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "\
|
2015-06-07 10:46:06 +02:00
|
|
|
|
reconfigure switch to a new operating system configuration\n"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "\
|
2016-11-02 06:48:15 +01:00
|
|
|
|
roll-back switch to the previous operating system configuration\n"))
|
2019-02-13 15:27:36 +01:00
|
|
|
|
(display (G_ "\
|
|
|
|
|
list-generations list the system generations\n"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "\
|
2016-11-02 06:48:15 +01:00
|
|
|
|
switch-generation switch to an existing operating system configuration\n"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "\
|
2019-02-13 15:27:36 +01:00
|
|
|
|
delete-generations delete old system generations\n"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "\
|
2015-06-07 10:46:06 +02:00
|
|
|
|
build build the operating system without installing anything\n"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "\
|
2015-10-31 20:59:45 +01:00
|
|
|
|
container build a container that shares the host's store\n"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "\
|
2015-06-07 10:46:06 +02:00
|
|
|
|
vm build a virtual machine image that shares the host's store\n"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "\
|
2015-06-07 10:46:06 +02:00
|
|
|
|
vm-image build a freestanding virtual machine image\n"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "\
|
2015-06-07 10:46:06 +02:00
|
|
|
|
disk-image build a disk image, suitable for a USB stick\n"))
|
2018-02-19 05:45:03 +01:00
|
|
|
|
(display (G_ "\
|
|
|
|
|
docker-image build a Docker image\n"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "\
|
2015-10-14 15:48:14 +02:00
|
|
|
|
init initialize a root file system to run GNU\n"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "\
|
2015-10-14 15:48:14 +02:00
|
|
|
|
extension-graph emit the service extension graph in Dot format\n"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "\
|
2016-01-27 21:06:07 +01:00
|
|
|
|
shepherd-graph emit the graph of shepherd services in Dot format\n"))
|
2014-05-16 21:56:00 +02:00
|
|
|
|
|
2014-02-18 23:45:58 +01:00
|
|
|
|
(show-build-options-help)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2015-09-19 11:14:42 +02:00
|
|
|
|
-d, --derivation return the derivation of the given system"))
|
2017-12-12 16:06:47 +01:00
|
|
|
|
(display (G_ "
|
|
|
|
|
-e, --expression=EXPR consider the operating-system EXPR evaluates to
|
|
|
|
|
instead of reading FILE, when applicable"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2015-05-25 22:52:41 +02:00
|
|
|
|
--on-error=STRATEGY
|
2018-12-14 19:41:41 +01:00
|
|
|
|
apply STRATEGY (one of nothing-special, backtrace,
|
|
|
|
|
or debug) when an error occurs while reading FILE"))
|
2017-07-03 12:34:07 +02:00
|
|
|
|
(display (G_ "
|
|
|
|
|
--file-system-type=TYPE
|
|
|
|
|
for 'disk-image', produce a root file system of TYPE
|
|
|
|
|
(one of 'ext4', 'iso9660')"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2014-04-09 01:20:19 +02:00
|
|
|
|
--image-size=SIZE for 'vm-image', produce an image of SIZE"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2017-04-17 11:01:39 +02:00
|
|
|
|
--no-bootloader for 'init', do not install a bootloader"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2014-11-21 00:02:26 +01:00
|
|
|
|
--share=SPEC for 'vm', share host file system according to SPEC"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2019-05-10 13:26:16 +02:00
|
|
|
|
-N, --network for 'container', allow containers to access the network"))
|
|
|
|
|
(display (G_ "
|
2017-04-04 08:49:22 +02:00
|
|
|
|
-r, --root=FILE for 'vm', 'vm-image', 'disk-image', 'container',
|
|
|
|
|
and 'build', make FILE a symlink to the result, and
|
|
|
|
|
register it as a garbage collector root"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2014-11-21 00:02:26 +01:00
|
|
|
|
--expose=SPEC for 'vm', expose host file system according to SPEC"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2014-11-07 22:43:33 +01:00
|
|
|
|
--full-boot for 'vm', make a full boot sequence"))
|
2018-03-15 10:28:22 +01:00
|
|
|
|
(display (G_ "
|
|
|
|
|
--skip-checks skip file system and initrd module safety checks"))
|
guix build: Re-purpose '--verbosity' and add '--debug'.
The previous '--verbosity' option was misleading and rarely what users
were looking for. The new option provides a consistent way to choose
whether or not to display the build log.
* guix/scripts/build.scm (show-build-options-help): Remove "--verbosity"
and add "--debug".
(set-build-options-from-command-line): Use the 'debug key of OPTS for
#:verbosity.
(%standard-build-options): Change "verbosity" to "debug". Use
'string->number*' instead of 'string->number'.
(%default-options): Change 'verbosity to 'debug and add a 'verbosity
key.
(show-help): Add '--verbosity'.
(%options): Likewise, and change '--quiet' to set the 'verbosity key of
RESULT.
(guix-build): Use 'with-status-verbosity' instead of parameterizing
CURRENT-BUILD-OUTPUT-PORT, honor the 'verbosity key of OPTS, and remove
'quiet?'.
* guix/scripts/environment.scm (show-help, %options): Add '--verbosity'.
(%default-options): Add 'debug'.
(guix-environment): Honor the 'verbosity key of OPTS.
* guix/scripts/pack.scm (%default-options): Add 'debug.
(%options, show-help): Add '--verbosity'.
(guix-pack): Honor the 'verbosity key of OPTS.
* guix/scripts/package.scm (%default-options): Add 'debug.
(show-help, %options): Add '--verbosity'. Mark '--verbose' as
deprecated and change it to set 'verbosity.
(guix-package): Honor the 'verbosity key of OPTS and remove 'verbose?'.
* guix/scripts/pull.scm (%default-options): Add 'debug.
(show-help, %options): Add '--verbosity'.
(guix-pull): Honor the 'verbosity key of OPTS.
* guix/scripts/system.scm (show-help, %options): Add '--verbosity'.
(%default-options): Add 'debug.
(guix-system): Honor the 'verbosity key of OPTS.
* guix/scripts/archive.scm (%default-options): Add 'debug,
'print-build-trace?, 'print-extended-build-trace?, and
'multiplexed-build-output?.
(show-help, %options): Add '--verbosity'.
(export-from-store): Remove call to 'set-build-options-from-command-line'.
(guix-archive): Wrap body in 'with-status-verbosity'. Add call to
'set-build-options-from-command-line.
* doc/guix.texi (Common Build Options): Document '--verbosity' and
'--debug'.
(Additional Build Options): Adjust description of '--quiet'.
2019-01-09 14:17:19 +01:00
|
|
|
|
(display (G_ "
|
|
|
|
|
-v, --verbosity=LEVEL use the given verbosity LEVEL"))
|
2014-02-18 23:45:58 +01:00
|
|
|
|
(newline)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2014-02-18 23:45:58 +01:00
|
|
|
|
-h, --help display this help and exit"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2014-02-18 23:45:58 +01:00
|
|
|
|
-V, --version display version information and exit"))
|
|
|
|
|
(newline)
|
|
|
|
|
(show-bug-report-information))
|
|
|
|
|
|
|
|
|
|
(define %options
|
|
|
|
|
;; Specifications of the command-line options.
|
|
|
|
|
(cons* (option '(#\h "help") #f #f
|
|
|
|
|
(lambda args
|
|
|
|
|
(show-help)
|
|
|
|
|
(exit 0)))
|
|
|
|
|
(option '(#\V "version") #f #f
|
|
|
|
|
(lambda args
|
|
|
|
|
(show-version-and-exit "guix system")))
|
2017-12-12 16:06:47 +01:00
|
|
|
|
(option '(#\e "expression") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'expression arg result)))
|
2015-09-19 11:14:42 +02:00
|
|
|
|
(option '(#\d "derivation") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'derivations-only? #t result)))
|
2015-05-25 22:52:41 +02:00
|
|
|
|
(option '("on-error") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'on-error (string->symbol arg)
|
|
|
|
|
result)))
|
2017-07-03 12:34:07 +02:00
|
|
|
|
(option '(#\t "file-system-type") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'file-system-type arg
|
|
|
|
|
result)))
|
2014-04-09 01:20:19 +02:00
|
|
|
|
(option '("image-size") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'image-size (size->number arg)
|
|
|
|
|
result)))
|
2019-05-10 13:26:16 +02:00
|
|
|
|
(option '(#\N "network") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'container-shared-network? #t result)))
|
2017-04-17 11:01:39 +02:00
|
|
|
|
(option '("no-bootloader" "no-grub") #f #f
|
2014-05-19 22:36:15 +02:00
|
|
|
|
(lambda (opt name arg result)
|
2017-04-15 15:22:47 +02:00
|
|
|
|
(alist-cons 'install-bootloader? #f result)))
|
2014-11-07 22:43:33 +01:00
|
|
|
|
(option '("full-boot") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'full-boot? #t result)))
|
2018-03-15 10:28:22 +01:00
|
|
|
|
(option '("skip-checks") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'skip-safety-checks? #t result)))
|
2014-11-21 00:02:26 +01:00
|
|
|
|
|
|
|
|
|
(option '("share") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'file-system-mapping
|
|
|
|
|
(specification->file-system-mapping arg #t)
|
|
|
|
|
result)))
|
|
|
|
|
(option '("expose") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'file-system-mapping
|
|
|
|
|
(specification->file-system-mapping arg #f)
|
|
|
|
|
result)))
|
|
|
|
|
|
2014-02-18 23:45:58 +01:00
|
|
|
|
(option '(#\n "dry-run") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
2016-08-28 16:22:19 +02:00
|
|
|
|
(alist-cons 'dry-run? #t (alist-cons 'graft? #f result))))
|
guix build: Re-purpose '--verbosity' and add '--debug'.
The previous '--verbosity' option was misleading and rarely what users
were looking for. The new option provides a consistent way to choose
whether or not to display the build log.
* guix/scripts/build.scm (show-build-options-help): Remove "--verbosity"
and add "--debug".
(set-build-options-from-command-line): Use the 'debug key of OPTS for
#:verbosity.
(%standard-build-options): Change "verbosity" to "debug". Use
'string->number*' instead of 'string->number'.
(%default-options): Change 'verbosity to 'debug and add a 'verbosity
key.
(show-help): Add '--verbosity'.
(%options): Likewise, and change '--quiet' to set the 'verbosity key of
RESULT.
(guix-build): Use 'with-status-verbosity' instead of parameterizing
CURRENT-BUILD-OUTPUT-PORT, honor the 'verbosity key of OPTS, and remove
'quiet?'.
* guix/scripts/environment.scm (show-help, %options): Add '--verbosity'.
(%default-options): Add 'debug'.
(guix-environment): Honor the 'verbosity key of OPTS.
* guix/scripts/pack.scm (%default-options): Add 'debug.
(%options, show-help): Add '--verbosity'.
(guix-pack): Honor the 'verbosity key of OPTS.
* guix/scripts/package.scm (%default-options): Add 'debug.
(show-help, %options): Add '--verbosity'. Mark '--verbose' as
deprecated and change it to set 'verbosity.
(guix-package): Honor the 'verbosity key of OPTS and remove 'verbose?'.
* guix/scripts/pull.scm (%default-options): Add 'debug.
(show-help, %options): Add '--verbosity'.
(guix-pull): Honor the 'verbosity key of OPTS.
* guix/scripts/system.scm (show-help, %options): Add '--verbosity'.
(%default-options): Add 'debug.
(guix-system): Honor the 'verbosity key of OPTS.
* guix/scripts/archive.scm (%default-options): Add 'debug,
'print-build-trace?, 'print-extended-build-trace?, and
'multiplexed-build-output?.
(show-help, %options): Add '--verbosity'.
(export-from-store): Remove call to 'set-build-options-from-command-line'.
(guix-archive): Wrap body in 'with-status-verbosity'. Add call to
'set-build-options-from-command-line.
* doc/guix.texi (Common Build Options): Document '--verbosity' and
'--debug'.
(Additional Build Options): Adjust description of '--quiet'.
2019-01-09 14:17:19 +01:00
|
|
|
|
(option '(#\v "verbosity") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(let ((level (string->number* arg)))
|
|
|
|
|
(alist-cons 'verbosity level
|
|
|
|
|
(alist-delete 'verbosity result)))))
|
2014-07-08 23:42:35 +02:00
|
|
|
|
(option '(#\s "system") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'system arg
|
|
|
|
|
(alist-delete 'system result eq?))))
|
2017-04-04 08:49:22 +02:00
|
|
|
|
(option '(#\r "root") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'gc-root arg result)))
|
2014-02-18 23:45:58 +01:00
|
|
|
|
%standard-build-options))
|
|
|
|
|
|
|
|
|
|
(define %default-options
|
|
|
|
|
;; Alist of default option values.
|
|
|
|
|
`((system . ,(%current-system))
|
|
|
|
|
(substitutes? . #t)
|
|
|
|
|
(build-hook? . #t)
|
2017-01-18 23:21:29 +01:00
|
|
|
|
(print-build-trace? . #t)
|
|
|
|
|
(print-extended-build-trace? . #t)
|
2018-10-15 23:06:55 +02:00
|
|
|
|
(multiplexed-build-output? . #t)
|
2017-12-07 22:49:08 +01:00
|
|
|
|
(graft? . #t)
|
guix build: Re-purpose '--verbosity' and add '--debug'.
The previous '--verbosity' option was misleading and rarely what users
were looking for. The new option provides a consistent way to choose
whether or not to display the build log.
* guix/scripts/build.scm (show-build-options-help): Remove "--verbosity"
and add "--debug".
(set-build-options-from-command-line): Use the 'debug key of OPTS for
#:verbosity.
(%standard-build-options): Change "verbosity" to "debug". Use
'string->number*' instead of 'string->number'.
(%default-options): Change 'verbosity to 'debug and add a 'verbosity
key.
(show-help): Add '--verbosity'.
(%options): Likewise, and change '--quiet' to set the 'verbosity key of
RESULT.
(guix-build): Use 'with-status-verbosity' instead of parameterizing
CURRENT-BUILD-OUTPUT-PORT, honor the 'verbosity key of OPTS, and remove
'quiet?'.
* guix/scripts/environment.scm (show-help, %options): Add '--verbosity'.
(%default-options): Add 'debug'.
(guix-environment): Honor the 'verbosity key of OPTS.
* guix/scripts/pack.scm (%default-options): Add 'debug.
(%options, show-help): Add '--verbosity'.
(guix-pack): Honor the 'verbosity key of OPTS.
* guix/scripts/package.scm (%default-options): Add 'debug.
(show-help, %options): Add '--verbosity'. Mark '--verbose' as
deprecated and change it to set 'verbosity.
(guix-package): Honor the 'verbosity key of OPTS and remove 'verbose?'.
* guix/scripts/pull.scm (%default-options): Add 'debug.
(show-help, %options): Add '--verbosity'.
(guix-pull): Honor the 'verbosity key of OPTS.
* guix/scripts/system.scm (show-help, %options): Add '--verbosity'.
(%default-options): Add 'debug.
(guix-system): Honor the 'verbosity key of OPTS.
* guix/scripts/archive.scm (%default-options): Add 'debug,
'print-build-trace?, 'print-extended-build-trace?, and
'multiplexed-build-output?.
(show-help, %options): Add '--verbosity'.
(export-from-store): Remove call to 'set-build-options-from-command-line'.
(guix-archive): Wrap body in 'with-status-verbosity'. Add call to
'set-build-options-from-command-line.
* doc/guix.texi (Common Build Options): Document '--verbosity' and
'--debug'.
(Additional Build Options): Adjust description of '--quiet'.
2019-01-09 14:17:19 +01:00
|
|
|
|
(debug . 0)
|
|
|
|
|
(verbosity . #f) ;default
|
2017-07-03 12:34:07 +02:00
|
|
|
|
(file-system-type . "ext4")
|
2017-06-30 00:04:38 +02:00
|
|
|
|
(image-size . guess)
|
2017-04-15 15:22:47 +02:00
|
|
|
|
(install-bootloader? . #t)))
|
2014-02-18 23:45:58 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Entry point.
|
|
|
|
|
;;;
|
|
|
|
|
|
2015-10-26 19:50:56 +01:00
|
|
|
|
(define (process-action action args opts)
|
2015-10-26 21:24:26 +01:00
|
|
|
|
"Process ACTION, a sub-command, with the arguments are listed in ARGS.
|
|
|
|
|
ACTION must be one of the sub-commands that takes an operating system
|
|
|
|
|
declaration as an argument (a file name.) OPTS is the raw alist of options
|
|
|
|
|
resulting from command-line parsing."
|
2017-04-15 15:22:47 +02:00
|
|
|
|
(let* ((file (match args
|
|
|
|
|
(() #f)
|
|
|
|
|
((x . _) x)))
|
2017-12-12 16:06:47 +01:00
|
|
|
|
(expr (assoc-ref opts 'expression))
|
2017-04-15 15:22:47 +02:00
|
|
|
|
(system (assoc-ref opts 'system))
|
2017-12-12 16:06:47 +01:00
|
|
|
|
(os (cond
|
|
|
|
|
((and expr file)
|
|
|
|
|
(leave
|
|
|
|
|
(G_ "both file and expression cannot be specified~%")))
|
|
|
|
|
(expr
|
|
|
|
|
(read/eval expr))
|
|
|
|
|
(file
|
|
|
|
|
(load* file %user-module
|
|
|
|
|
#:on-error (assoc-ref opts 'on-error)))
|
|
|
|
|
(else
|
|
|
|
|
(leave (G_ "no configuration specified~%")))))
|
2017-04-15 15:22:47 +02:00
|
|
|
|
|
|
|
|
|
(dry? (assoc-ref opts 'dry-run?))
|
|
|
|
|
(bootloader? (assoc-ref opts 'install-bootloader?))
|
|
|
|
|
(target (match args
|
|
|
|
|
((first second) second)
|
|
|
|
|
(_ #f)))
|
2017-08-23 21:48:58 +02:00
|
|
|
|
(bootloader-target
|
|
|
|
|
(and bootloader?
|
|
|
|
|
(bootloader-configuration-target
|
2017-04-15 15:22:47 +02:00
|
|
|
|
(operating-system-bootloader os)))))
|
2015-10-26 19:50:56 +01:00
|
|
|
|
|
|
|
|
|
(with-store store
|
|
|
|
|
(set-build-options-from-command-line store opts)
|
|
|
|
|
|
|
|
|
|
(run-with-store store
|
|
|
|
|
(mbegin %store-monad
|
|
|
|
|
(set-guile-for-build (default-guile))
|
|
|
|
|
(case action
|
|
|
|
|
((extension-graph)
|
|
|
|
|
(export-extension-graph os (current-output-port)))
|
2016-01-27 21:06:07 +01:00
|
|
|
|
((shepherd-graph)
|
|
|
|
|
(export-shepherd-graph os (current-output-port)))
|
2015-10-26 19:50:56 +01:00
|
|
|
|
(else
|
2017-05-21 11:49:07 +02:00
|
|
|
|
(unless (memq action '(build init))
|
|
|
|
|
(warn-about-old-distro #:suggested-command
|
|
|
|
|
"guix system reconfigure"))
|
|
|
|
|
|
2015-10-26 19:50:56 +01:00
|
|
|
|
(perform-action action os
|
|
|
|
|
#:dry-run? dry?
|
|
|
|
|
#:derivations-only? (assoc-ref opts
|
|
|
|
|
'derivations-only?)
|
|
|
|
|
#:use-substitutes? (assoc-ref opts 'substitutes?)
|
2018-03-15 10:28:22 +01:00
|
|
|
|
#:skip-safety-checks?
|
|
|
|
|
(assoc-ref opts 'skip-safety-checks?)
|
2017-07-03 12:34:07 +02:00
|
|
|
|
#:file-system-type (assoc-ref opts 'file-system-type)
|
2015-10-26 19:50:56 +01:00
|
|
|
|
#:image-size (assoc-ref opts 'image-size)
|
|
|
|
|
#:full-boot? (assoc-ref opts 'full-boot?)
|
2019-05-10 13:26:16 +02:00
|
|
|
|
#:container-shared-network?
|
|
|
|
|
(assoc-ref opts 'container-shared-network?)
|
2015-10-26 19:50:56 +01:00
|
|
|
|
#:mappings (filter-map (match-lambda
|
|
|
|
|
(('file-system-mapping . m)
|
|
|
|
|
m)
|
|
|
|
|
(_ #f))
|
|
|
|
|
opts)
|
2017-04-02 09:53:51 +02:00
|
|
|
|
#:install-bootloader? bootloader?
|
2017-08-23 21:48:58 +02:00
|
|
|
|
#:target target
|
|
|
|
|
#:bootloader-target bootloader-target
|
2017-04-04 08:49:22 +02:00
|
|
|
|
#:gc-root (assoc-ref opts 'gc-root)))))
|
2018-10-23 00:56:25 +02:00
|
|
|
|
#:system system))
|
|
|
|
|
(warn-about-disk-space)))
|
2015-10-26 19:50:56 +01:00
|
|
|
|
|
2017-09-13 16:07:30 +02:00
|
|
|
|
(define (resolve-subcommand name)
|
|
|
|
|
(let ((module (resolve-interface
|
|
|
|
|
`(guix scripts system ,(string->symbol name))))
|
|
|
|
|
(proc (string->symbol (string-append "guix-system-" name))))
|
|
|
|
|
(module-ref module proc)))
|
|
|
|
|
|
2015-10-26 21:24:26 +01:00
|
|
|
|
(define (process-command command args opts)
|
|
|
|
|
"Process COMMAND, one of the 'guix system' sub-commands. ARGS is its
|
|
|
|
|
argument list and OPTS is the option alist."
|
|
|
|
|
(case command
|
2016-11-02 06:48:15 +01:00
|
|
|
|
;; The following commands do not need to use the store, and they do not need
|
|
|
|
|
;; an operating system configuration file.
|
2015-10-26 21:24:26 +01:00
|
|
|
|
((list-generations)
|
|
|
|
|
(let ((pattern (match args
|
|
|
|
|
(() "")
|
|
|
|
|
((pattern) pattern)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(x (leave (G_ "wrong number of arguments~%"))))))
|
2015-10-26 21:24:26 +01:00
|
|
|
|
(list-generations pattern)))
|
2017-09-13 16:07:30 +02:00
|
|
|
|
((search)
|
|
|
|
|
(apply (resolve-subcommand "search") args))
|
2016-11-02 06:48:15 +01:00
|
|
|
|
;; The following commands need to use the store, but they do not need an
|
|
|
|
|
;; operating system configuration file.
|
2019-02-13 15:27:36 +01:00
|
|
|
|
((delete-generations)
|
|
|
|
|
(let ((pattern (match args
|
|
|
|
|
(() "")
|
|
|
|
|
((pattern) pattern)
|
|
|
|
|
(x (leave (G_ "wrong number of arguments~%"))))))
|
|
|
|
|
(with-store store
|
|
|
|
|
(delete-matching-generations store %system-profile pattern)
|
|
|
|
|
(reinstall-bootloader store (generation-number %system-profile)))))
|
2016-11-02 06:48:15 +01:00
|
|
|
|
((switch-generation)
|
|
|
|
|
(let ((pattern (match args
|
|
|
|
|
((pattern) pattern)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(x (leave (G_ "wrong number of arguments~%"))))))
|
2016-11-02 06:48:15 +01:00
|
|
|
|
(with-store store
|
|
|
|
|
(set-build-options-from-command-line store opts)
|
|
|
|
|
(switch-to-system-generation store pattern))))
|
|
|
|
|
((roll-back)
|
|
|
|
|
(let ((pattern (match args
|
|
|
|
|
(() "")
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(x (leave (G_ "wrong number of arguments~%"))))))
|
2016-11-02 06:48:15 +01:00
|
|
|
|
(with-store store
|
|
|
|
|
(set-build-options-from-command-line store opts)
|
|
|
|
|
(roll-back-system store))))
|
|
|
|
|
;; The following commands need to use the store, and they also
|
|
|
|
|
;; need an operating system configuration file.
|
|
|
|
|
(else (process-action command args opts))))
|
2015-10-26 21:24:26 +01:00
|
|
|
|
|
2014-02-18 23:45:58 +01:00
|
|
|
|
(define (guix-system . args)
|
2015-02-25 23:31:51 +01:00
|
|
|
|
(define (parse-sub-command arg result)
|
|
|
|
|
;; Parse sub-command ARG and augment RESULT accordingly.
|
|
|
|
|
(if (assoc-ref result 'action)
|
|
|
|
|
(alist-cons 'argument arg result)
|
|
|
|
|
(let ((action (string->symbol arg)))
|
|
|
|
|
(case action
|
2015-06-08 15:04:38 +02:00
|
|
|
|
((build container vm vm-image disk-image reconfigure init
|
2019-02-13 15:27:36 +01:00
|
|
|
|
extension-graph shepherd-graph
|
|
|
|
|
list-generations delete-generations roll-back
|
2018-02-19 05:45:03 +01:00
|
|
|
|
switch-generation search docker-image)
|
2015-02-25 23:31:51 +01:00
|
|
|
|
(alist-cons 'action action result))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(else (leave (G_ "~a: unknown action~%") action))))))
|
2014-02-18 23:45:58 +01:00
|
|
|
|
|
2014-05-18 21:32:57 +02:00
|
|
|
|
(define (match-pair car)
|
|
|
|
|
;; Return a procedure that matches a pair with CAR.
|
|
|
|
|
(match-lambda
|
2015-10-14 15:48:14 +02:00
|
|
|
|
((head . tail)
|
|
|
|
|
(and (eq? car head) tail))
|
|
|
|
|
(_ #f)))
|
2014-05-18 21:32:57 +02:00
|
|
|
|
|
|
|
|
|
(define (option-arguments opts)
|
|
|
|
|
;; Extract the plain arguments from OPTS.
|
|
|
|
|
(let* ((args (reverse (filter-map (match-pair 'argument) opts)))
|
|
|
|
|
(count (length args))
|
2017-12-12 16:06:47 +01:00
|
|
|
|
(action (assoc-ref opts 'action))
|
|
|
|
|
(expr (assoc-ref opts 'expression)))
|
2014-05-18 21:32:57 +02:00
|
|
|
|
(define (fail)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(leave (G_ "wrong number of arguments for action '~a'~%")
|
2014-05-18 21:32:57 +02:00
|
|
|
|
action))
|
|
|
|
|
|
2015-09-15 00:04:27 +02:00
|
|
|
|
(unless action
|
|
|
|
|
(format (current-error-port)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(G_ "guix system: missing command name~%"))
|
2015-09-15 00:04:27 +02:00
|
|
|
|
(format (current-error-port)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(G_ "Try 'guix system --help' for more information.~%"))
|
2015-09-15 00:04:27 +02:00
|
|
|
|
(exit 1))
|
|
|
|
|
|
2014-05-18 21:32:57 +02:00
|
|
|
|
(case action
|
2018-02-19 05:45:03 +01:00
|
|
|
|
((build container vm vm-image disk-image docker-image reconfigure)
|
2017-12-12 16:06:47 +01:00
|
|
|
|
(unless (or (= count 1)
|
|
|
|
|
(and expr (= count 0)))
|
2014-05-18 21:32:57 +02:00
|
|
|
|
(fail)))
|
|
|
|
|
((init)
|
|
|
|
|
(unless (= count 2)
|
|
|
|
|
(fail))))
|
|
|
|
|
args))
|
|
|
|
|
|
2014-02-18 23:45:58 +01:00
|
|
|
|
(with-error-handling
|
2015-02-25 23:31:51 +01:00
|
|
|
|
(let* ((opts (parse-command-line args %options
|
|
|
|
|
(list %default-options)
|
|
|
|
|
#:argument-handler
|
|
|
|
|
parse-sub-command))
|
2014-05-19 22:36:15 +02:00
|
|
|
|
(args (option-arguments opts))
|
2015-10-26 19:50:56 +01:00
|
|
|
|
(command (assoc-ref opts 'action)))
|
2017-01-18 23:21:29 +01:00
|
|
|
|
(parameterize ((%graft? (assoc-ref opts 'graft?)))
|
guix build: Re-purpose '--verbosity' and add '--debug'.
The previous '--verbosity' option was misleading and rarely what users
were looking for. The new option provides a consistent way to choose
whether or not to display the build log.
* guix/scripts/build.scm (show-build-options-help): Remove "--verbosity"
and add "--debug".
(set-build-options-from-command-line): Use the 'debug key of OPTS for
#:verbosity.
(%standard-build-options): Change "verbosity" to "debug". Use
'string->number*' instead of 'string->number'.
(%default-options): Change 'verbosity to 'debug and add a 'verbosity
key.
(show-help): Add '--verbosity'.
(%options): Likewise, and change '--quiet' to set the 'verbosity key of
RESULT.
(guix-build): Use 'with-status-verbosity' instead of parameterizing
CURRENT-BUILD-OUTPUT-PORT, honor the 'verbosity key of OPTS, and remove
'quiet?'.
* guix/scripts/environment.scm (show-help, %options): Add '--verbosity'.
(%default-options): Add 'debug'.
(guix-environment): Honor the 'verbosity key of OPTS.
* guix/scripts/pack.scm (%default-options): Add 'debug.
(%options, show-help): Add '--verbosity'.
(guix-pack): Honor the 'verbosity key of OPTS.
* guix/scripts/package.scm (%default-options): Add 'debug.
(show-help, %options): Add '--verbosity'. Mark '--verbose' as
deprecated and change it to set 'verbosity.
(guix-package): Honor the 'verbosity key of OPTS and remove 'verbose?'.
* guix/scripts/pull.scm (%default-options): Add 'debug.
(show-help, %options): Add '--verbosity'.
(guix-pull): Honor the 'verbosity key of OPTS.
* guix/scripts/system.scm (show-help, %options): Add '--verbosity'.
(%default-options): Add 'debug.
(guix-system): Honor the 'verbosity key of OPTS.
* guix/scripts/archive.scm (%default-options): Add 'debug,
'print-build-trace?, 'print-extended-build-trace?, and
'multiplexed-build-output?.
(show-help, %options): Add '--verbosity'.
(export-from-store): Remove call to 'set-build-options-from-command-line'.
(guix-archive): Wrap body in 'with-status-verbosity'. Add call to
'set-build-options-from-command-line.
* doc/guix.texi (Common Build Options): Document '--verbosity' and
'--debug'.
(Additional Build Options): Adjust description of '--quiet'.
2019-01-09 14:17:19 +01:00
|
|
|
|
(with-status-verbosity (or (assoc-ref opts 'verbosity)
|
2019-04-04 17:32:37 +02:00
|
|
|
|
(if (eq? command 'build) 2 1))
|
2017-01-18 23:21:29 +01:00
|
|
|
|
(process-command command args opts))))))
|
2014-06-27 00:06:46 +02:00
|
|
|
|
|
2016-05-04 16:38:22 +02:00
|
|
|
|
;;; Local Variables:
|
|
|
|
|
;;; eval: (put 'call-with-service-upgrade-info 'scheme-indent-function 1)
|
|
|
|
|
;;; End:
|
|
|
|
|
|
2014-06-27 00:06:46 +02:00
|
|
|
|
;;; system.scm ends here
|