2020-04-28 12:15:28 +00:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
|
|
|
|
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
2020-06-11 20:52:12 +00:00
|
|
|
|
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
2020-04-28 12:15:28 +00:00
|
|
|
|
;;;
|
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
;;; your option) any later version.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
|
;;;
|
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
(define-module (gnu system image)
|
system: image: Add image-type support.
* gnu/system/image.scm (image-with-os): New macro. Rename the old
"image-with-os" procedure to ...
(image-with-os*): ... this new procedure,
(system-image): adapt according,
(raw-image-type, iso-image-type, uncompressed-iso-image-type
%image-types): new variables,
(lookup-image-type-by-name): new procedure.
(find-image): remove it.
* gnu/system/images/hurd.scm (hurd-image-type): New variable,
use it to define ...
(hurd-disk-image): ... this variable, using "os->image" procedure.
* gnu/tests/install.scm (run-install): Rename
installation-disk-image-file-system-type parameter to installation-image-type,
use os->config instead of find-image to compute the image passed to system-image,
(%test-iso-image-installer) adapt accordingly,
(guided-installation-test): ditto.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-07-31 14:49:28 +00:00
|
|
|
|
#:use-module (guix diagnostics)
|
|
|
|
|
#:use-module (guix discovery)
|
2020-04-28 12:15:28 +00:00
|
|
|
|
#:use-module (guix gexp)
|
|
|
|
|
#:use-module (guix modules)
|
|
|
|
|
#:use-module (guix monads)
|
|
|
|
|
#:use-module (guix records)
|
|
|
|
|
#:use-module (guix store)
|
|
|
|
|
#:use-module (guix ui)
|
|
|
|
|
#:use-module (guix utils)
|
|
|
|
|
#:use-module ((guix self) #:select (make-config.scm))
|
|
|
|
|
#:use-module (gnu bootloader)
|
|
|
|
|
#:use-module (gnu bootloader grub)
|
|
|
|
|
#:use-module (gnu image)
|
|
|
|
|
#:use-module (gnu services)
|
|
|
|
|
#:use-module (gnu services base)
|
|
|
|
|
#:use-module (gnu system)
|
|
|
|
|
#:use-module (gnu system file-systems)
|
|
|
|
|
#:use-module (gnu system uuid)
|
|
|
|
|
#:use-module (gnu system vm)
|
|
|
|
|
#:use-module (guix packages)
|
|
|
|
|
#:use-module (gnu packages base)
|
|
|
|
|
#:use-module (gnu packages bootloaders)
|
|
|
|
|
#:use-module (gnu packages cdrom)
|
|
|
|
|
#:use-module (gnu packages disk)
|
|
|
|
|
#:use-module (gnu packages gawk)
|
|
|
|
|
#:use-module (gnu packages genimage)
|
|
|
|
|
#:use-module (gnu packages guile)
|
|
|
|
|
#:autoload (gnu packages gnupg) (guile-gcrypt)
|
2020-05-23 17:10:44 +00:00
|
|
|
|
#:use-module (gnu packages hurd)
|
2020-04-28 12:15:28 +00:00
|
|
|
|
#:use-module (gnu packages linux)
|
|
|
|
|
#:use-module (gnu packages mtools)
|
2020-09-29 09:37:19 +00:00
|
|
|
|
#:use-module (gnu packages virtualization)
|
2020-04-28 12:15:28 +00:00
|
|
|
|
#:use-module ((srfi srfi-1) #:prefix srfi-1:)
|
|
|
|
|
#:use-module (srfi srfi-11)
|
|
|
|
|
#:use-module (srfi srfi-26)
|
|
|
|
|
#:use-module (srfi srfi-35)
|
|
|
|
|
#:use-module (rnrs bytevectors)
|
2020-09-29 09:37:19 +00:00
|
|
|
|
#:use-module (ice-9 format)
|
2020-04-28 12:15:28 +00:00
|
|
|
|
#:use-module (ice-9 match)
|
2020-06-13 15:33:10 +00:00
|
|
|
|
#:export (root-offset
|
|
|
|
|
root-label
|
|
|
|
|
|
|
|
|
|
esp-partition
|
2020-04-28 12:15:28 +00:00
|
|
|
|
root-partition
|
|
|
|
|
|
|
|
|
|
efi-disk-image
|
|
|
|
|
iso9660-image
|
2020-10-05 09:07:53 +00:00
|
|
|
|
arm64-disk-image
|
2020-04-28 12:15:28 +00:00
|
|
|
|
|
system: image: Add image-type support.
* gnu/system/image.scm (image-with-os): New macro. Rename the old
"image-with-os" procedure to ...
(image-with-os*): ... this new procedure,
(system-image): adapt according,
(raw-image-type, iso-image-type, uncompressed-iso-image-type
%image-types): new variables,
(lookup-image-type-by-name): new procedure.
(find-image): remove it.
* gnu/system/images/hurd.scm (hurd-image-type): New variable,
use it to define ...
(hurd-disk-image): ... this variable, using "os->image" procedure.
* gnu/tests/install.scm (run-install): Rename
installation-disk-image-file-system-type parameter to installation-image-type,
use os->config instead of find-image to compute the image passed to system-image,
(%test-iso-image-installer) adapt accordingly,
(guided-installation-test): ditto.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-07-31 14:49:28 +00:00
|
|
|
|
image-with-os
|
|
|
|
|
raw-image-type
|
2020-10-02 12:54:26 +00:00
|
|
|
|
qcow2-image-type
|
system: image: Add image-type support.
* gnu/system/image.scm (image-with-os): New macro. Rename the old
"image-with-os" procedure to ...
(image-with-os*): ... this new procedure,
(system-image): adapt according,
(raw-image-type, iso-image-type, uncompressed-iso-image-type
%image-types): new variables,
(lookup-image-type-by-name): new procedure.
(find-image): remove it.
* gnu/system/images/hurd.scm (hurd-image-type): New variable,
use it to define ...
(hurd-disk-image): ... this variable, using "os->image" procedure.
* gnu/tests/install.scm (run-install): Rename
installation-disk-image-file-system-type parameter to installation-image-type,
use os->config instead of find-image to compute the image passed to system-image,
(%test-iso-image-installer) adapt accordingly,
(guided-installation-test): ditto.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-07-31 14:49:28 +00:00
|
|
|
|
iso-image-type
|
|
|
|
|
uncompressed-iso-image-type
|
2020-10-05 09:07:53 +00:00
|
|
|
|
arm64-image-type
|
system: image: Add image-type support.
* gnu/system/image.scm (image-with-os): New macro. Rename the old
"image-with-os" procedure to ...
(image-with-os*): ... this new procedure,
(system-image): adapt according,
(raw-image-type, iso-image-type, uncompressed-iso-image-type
%image-types): new variables,
(lookup-image-type-by-name): new procedure.
(find-image): remove it.
* gnu/system/images/hurd.scm (hurd-image-type): New variable,
use it to define ...
(hurd-disk-image): ... this variable, using "os->image" procedure.
* gnu/tests/install.scm (run-install): Rename
installation-disk-image-file-system-type parameter to installation-image-type,
use os->config instead of find-image to compute the image passed to system-image,
(%test-iso-image-installer) adapt accordingly,
(guided-installation-test): ditto.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-07-31 14:49:28 +00:00
|
|
|
|
|
|
|
|
|
image-with-label
|
2020-08-29 13:34:56 +00:00
|
|
|
|
system-image
|
system: image: Add image-type support.
* gnu/system/image.scm (image-with-os): New macro. Rename the old
"image-with-os" procedure to ...
(image-with-os*): ... this new procedure,
(system-image): adapt according,
(raw-image-type, iso-image-type, uncompressed-iso-image-type
%image-types): new variables,
(lookup-image-type-by-name): new procedure.
(find-image): remove it.
* gnu/system/images/hurd.scm (hurd-image-type): New variable,
use it to define ...
(hurd-disk-image): ... this variable, using "os->image" procedure.
* gnu/tests/install.scm (run-install): Rename
installation-disk-image-file-system-type parameter to installation-image-type,
use os->config instead of find-image to compute the image passed to system-image,
(%test-iso-image-installer) adapt accordingly,
(guided-installation-test): ditto.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-07-31 14:49:28 +00:00
|
|
|
|
|
|
|
|
|
%image-types
|
|
|
|
|
lookup-image-type-by-name))
|
2020-04-28 12:15:28 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Images definitions.
|
|
|
|
|
;;;
|
|
|
|
|
|
2020-05-29 07:05:53 +00:00
|
|
|
|
;; This is the offset before the first partition. GRUB will install itself in
|
|
|
|
|
;; this post-MBR gap.
|
|
|
|
|
(define root-offset (* 512 2048))
|
|
|
|
|
|
|
|
|
|
;; Generic root partition label.
|
|
|
|
|
(define root-label "Guix_image")
|
|
|
|
|
|
2020-04-28 12:15:28 +00:00
|
|
|
|
(define esp-partition
|
|
|
|
|
(partition
|
|
|
|
|
(size (* 40 (expt 2 20)))
|
2020-05-29 07:05:53 +00:00
|
|
|
|
(offset root-offset)
|
2020-04-28 12:15:28 +00:00
|
|
|
|
(label "GNU-ESP") ;cosmetic only
|
|
|
|
|
;; Use "vfat" here since this property is used when mounting. The actual
|
|
|
|
|
;; FAT-ness is based on file system size (16 in this case).
|
|
|
|
|
(file-system "vfat")
|
|
|
|
|
(flags '(esp))
|
|
|
|
|
(initializer (gexp initialize-efi-partition))))
|
|
|
|
|
|
|
|
|
|
(define root-partition
|
|
|
|
|
(partition
|
|
|
|
|
(size 'guess)
|
2020-05-29 07:05:53 +00:00
|
|
|
|
(label root-label)
|
2020-04-28 12:15:28 +00:00
|
|
|
|
(file-system "ext4")
|
|
|
|
|
(flags '(boot))
|
|
|
|
|
(initializer (gexp initialize-root-partition))))
|
|
|
|
|
|
|
|
|
|
(define efi-disk-image
|
|
|
|
|
(image
|
|
|
|
|
(format 'disk-image)
|
|
|
|
|
(partitions (list esp-partition root-partition))))
|
|
|
|
|
|
|
|
|
|
(define iso9660-image
|
|
|
|
|
(image
|
|
|
|
|
(format 'iso9660)
|
|
|
|
|
(partitions
|
|
|
|
|
(list (partition
|
|
|
|
|
(size 'guess)
|
|
|
|
|
(label "GUIX_IMAGE")
|
2020-06-24 18:50:42 +00:00
|
|
|
|
(flags '(boot)))))))
|
2020-04-28 12:15:28 +00:00
|
|
|
|
|
2020-10-05 09:07:53 +00:00
|
|
|
|
(define arm64-disk-image
|
|
|
|
|
(image
|
|
|
|
|
(format 'disk-image)
|
|
|
|
|
(target "aarch64-linux-gnu")
|
|
|
|
|
(partitions
|
|
|
|
|
(list (partition
|
|
|
|
|
(inherit root-partition)
|
|
|
|
|
(offset root-offset))))
|
|
|
|
|
;; FIXME: Deleting and creating "/var/run" and "/tmp" on the overlayfs
|
|
|
|
|
;; fails.
|
|
|
|
|
(volatile-root? #f)))
|
|
|
|
|
|
system: image: Add image-type support.
* gnu/system/image.scm (image-with-os): New macro. Rename the old
"image-with-os" procedure to ...
(image-with-os*): ... this new procedure,
(system-image): adapt according,
(raw-image-type, iso-image-type, uncompressed-iso-image-type
%image-types): new variables,
(lookup-image-type-by-name): new procedure.
(find-image): remove it.
* gnu/system/images/hurd.scm (hurd-image-type): New variable,
use it to define ...
(hurd-disk-image): ... this variable, using "os->image" procedure.
* gnu/tests/install.scm (run-install): Rename
installation-disk-image-file-system-type parameter to installation-image-type,
use os->config instead of find-image to compute the image passed to system-image,
(%test-iso-image-installer) adapt accordingly,
(guided-installation-test): ditto.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-07-31 14:49:28 +00:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Images types.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-syntax-rule (image-with-os base-image os)
|
|
|
|
|
"Return an image inheriting from BASE-IMAGE, with the operating-system field
|
|
|
|
|
set to the given OS."
|
|
|
|
|
(image
|
|
|
|
|
(inherit base-image)
|
|
|
|
|
(operating-system os)))
|
|
|
|
|
|
|
|
|
|
(define raw-image-type
|
|
|
|
|
(image-type
|
|
|
|
|
(name 'raw)
|
|
|
|
|
(constructor (cut image-with-os efi-disk-image <>))))
|
|
|
|
|
|
2020-10-02 12:54:26 +00:00
|
|
|
|
(define qcow2-image-type
|
|
|
|
|
(image-type
|
|
|
|
|
(name 'qcow2)
|
|
|
|
|
(constructor (cut image-with-os
|
|
|
|
|
(image
|
|
|
|
|
(inherit efi-disk-image)
|
|
|
|
|
(name 'image.qcow2)
|
|
|
|
|
(format 'compressed-qcow2))
|
|
|
|
|
<>))))
|
|
|
|
|
|
system: image: Add image-type support.
* gnu/system/image.scm (image-with-os): New macro. Rename the old
"image-with-os" procedure to ...
(image-with-os*): ... this new procedure,
(system-image): adapt according,
(raw-image-type, iso-image-type, uncompressed-iso-image-type
%image-types): new variables,
(lookup-image-type-by-name): new procedure.
(find-image): remove it.
* gnu/system/images/hurd.scm (hurd-image-type): New variable,
use it to define ...
(hurd-disk-image): ... this variable, using "os->image" procedure.
* gnu/tests/install.scm (run-install): Rename
installation-disk-image-file-system-type parameter to installation-image-type,
use os->config instead of find-image to compute the image passed to system-image,
(%test-iso-image-installer) adapt accordingly,
(guided-installation-test): ditto.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-07-31 14:49:28 +00:00
|
|
|
|
(define iso-image-type
|
|
|
|
|
(image-type
|
|
|
|
|
(name 'iso9660)
|
|
|
|
|
(constructor (cut image-with-os iso9660-image <>))))
|
|
|
|
|
|
|
|
|
|
(define uncompressed-iso-image-type
|
|
|
|
|
(image-type
|
|
|
|
|
(name 'uncompressed-iso9660)
|
|
|
|
|
(constructor (cut image-with-os
|
|
|
|
|
(image
|
|
|
|
|
(inherit iso9660-image)
|
|
|
|
|
(compression? #f))
|
|
|
|
|
<>))))
|
|
|
|
|
|
2020-10-05 09:07:53 +00:00
|
|
|
|
(define arm64-image-type
|
|
|
|
|
(image-type
|
|
|
|
|
(name 'arm)
|
|
|
|
|
(constructor (cut image-with-os arm64-disk-image <>))))
|
|
|
|
|
|
2020-04-28 12:15:28 +00:00
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
;; Helpers.
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
(define not-config?
|
|
|
|
|
;; Select (guix …) and (gnu …) modules, except (guix config).
|
|
|
|
|
(match-lambda
|
|
|
|
|
(('guix 'config) #f)
|
|
|
|
|
(('guix rest ...) #t)
|
|
|
|
|
(('gnu rest ...) #t)
|
|
|
|
|
(rest #f)))
|
|
|
|
|
|
|
|
|
|
(define (partition->gexp partition)
|
|
|
|
|
"Turn PARTITION, a <partition> object, into a list-valued gexp suitable for
|
|
|
|
|
'make-partition-image'."
|
|
|
|
|
#~'(#$@(list (partition-size partition))
|
|
|
|
|
#$(partition-file-system partition)
|
2020-05-26 14:25:25 +00:00
|
|
|
|
#$(partition-file-system-options partition)
|
2020-04-28 12:15:28 +00:00
|
|
|
|
#$(partition-label partition)
|
|
|
|
|
#$(and=> (partition-uuid partition)
|
|
|
|
|
uuid-bytevector)))
|
|
|
|
|
|
|
|
|
|
(define gcrypt-sqlite3&co
|
|
|
|
|
;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs.
|
|
|
|
|
(srfi-1:append-map
|
|
|
|
|
(lambda (package)
|
|
|
|
|
(cons package
|
|
|
|
|
(match (package-transitive-propagated-inputs package)
|
|
|
|
|
(((labels packages) ...)
|
|
|
|
|
packages))))
|
2020-08-25 10:39:11 +00:00
|
|
|
|
(list guile-gcrypt guile-sqlite3)))
|
2020-04-28 12:15:28 +00:00
|
|
|
|
|
|
|
|
|
(define-syntax-rule (with-imported-modules* gexp* ...)
|
|
|
|
|
(with-extensions gcrypt-sqlite3&co
|
|
|
|
|
(with-imported-modules `(,@(source-module-closure
|
|
|
|
|
'((gnu build vm)
|
|
|
|
|
(gnu build image)
|
2020-10-05 08:58:55 +00:00
|
|
|
|
(gnu build bootloader)
|
2020-06-01 07:46:39 +00:00
|
|
|
|
(gnu build hurd-boot)
|
2020-05-23 17:10:44 +00:00
|
|
|
|
(gnu build linux-boot)
|
2020-04-28 12:15:28 +00:00
|
|
|
|
(guix store database))
|
|
|
|
|
#:select? not-config?)
|
|
|
|
|
((guix config) => ,(make-config.scm)))
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (gnu build vm)
|
|
|
|
|
(gnu build image)
|
2020-10-05 08:58:55 +00:00
|
|
|
|
(gnu build bootloader)
|
2020-06-01 07:46:39 +00:00
|
|
|
|
(gnu build hurd-boot)
|
2020-05-23 17:10:44 +00:00
|
|
|
|
(gnu build linux-boot)
|
2020-04-28 12:15:28 +00:00
|
|
|
|
(guix store database)
|
|
|
|
|
(guix build utils))
|
|
|
|
|
gexp* ...))))
|
|
|
|
|
|
2020-05-23 17:09:14 +00:00
|
|
|
|
(define (root-partition? partition)
|
|
|
|
|
"Return true if PARTITION is the root partition, false otherwise."
|
|
|
|
|
(member 'boot (partition-flags partition)))
|
|
|
|
|
|
|
|
|
|
(define (find-root-partition image)
|
|
|
|
|
"Return the root partition of the given IMAGE."
|
|
|
|
|
(srfi-1:find root-partition? (image-partitions image)))
|
|
|
|
|
|
|
|
|
|
(define (root-partition-index image)
|
|
|
|
|
"Return the index of the root partition of the given IMAGE."
|
|
|
|
|
(1+ (srfi-1:list-index root-partition? (image-partitions image))))
|
|
|
|
|
|
2020-04-28 12:15:28 +00:00
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
;; Disk image.
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
(define* (system-disk-image image
|
|
|
|
|
#:key
|
|
|
|
|
(name "disk-image")
|
|
|
|
|
bootcfg
|
|
|
|
|
bootloader
|
|
|
|
|
register-closures?
|
|
|
|
|
(inputs '()))
|
|
|
|
|
"Return as a file-like object, the disk-image described by IMAGE. Said
|
|
|
|
|
image can be copied on a USB stick as is. BOOTLOADER is the bootloader that
|
|
|
|
|
will be installed and configured according to BOOTCFG parameter.
|
|
|
|
|
|
|
|
|
|
Raw images of the IMAGE partitions are first created. Then, genimage is used
|
|
|
|
|
to assemble the partition images into a disk-image without resorting to a
|
|
|
|
|
virtual machine.
|
|
|
|
|
|
|
|
|
|
INPUTS is a list of inputs (as for packages). When REGISTER-CLOSURES? is
|
|
|
|
|
true, register INPUTS in the store database of the image so that Guix can be
|
|
|
|
|
used in the image."
|
|
|
|
|
|
|
|
|
|
(define genimage-name "image")
|
|
|
|
|
|
|
|
|
|
(define (image->genimage-cfg image)
|
|
|
|
|
;; Return as a file-like object, the genimage configuration file
|
|
|
|
|
;; describing the given IMAGE.
|
|
|
|
|
(define (format->image-type format)
|
|
|
|
|
;; Return the genimage format corresponding to FORMAT. For now, only
|
|
|
|
|
;; the hdimage format (raw disk-image) is supported.
|
2020-09-29 09:37:19 +00:00
|
|
|
|
(cond
|
|
|
|
|
((memq format '(disk-image compressed-qcow2)) "hdimage")
|
2020-04-28 12:15:28 +00:00
|
|
|
|
(else
|
|
|
|
|
(raise (condition
|
|
|
|
|
(&message
|
|
|
|
|
(message
|
|
|
|
|
(format #f (G_ "Unsupported image type ~a~%.") format))))))))
|
|
|
|
|
|
|
|
|
|
(define (partition->dos-type partition)
|
|
|
|
|
;; Return the MBR partition type corresponding to the given PARTITION.
|
|
|
|
|
;; See: https://en.wikipedia.org/wiki/Partition_type.
|
|
|
|
|
(let ((flags (partition-flags partition)))
|
|
|
|
|
(cond
|
|
|
|
|
((member 'esp flags) "0xEF")
|
|
|
|
|
(else "0x83"))))
|
|
|
|
|
|
|
|
|
|
(define (partition-image partition)
|
|
|
|
|
;; Return as a file-like object, an image of the given PARTITION. A
|
|
|
|
|
;; directory, filled by calling the PARTITION initializer procedure, is
|
|
|
|
|
;; first created within the store. Then, an image of this directory is
|
|
|
|
|
;; created using tools such as 'mke2fs' or 'mkdosfs', depending on the
|
|
|
|
|
;; partition file-system type.
|
|
|
|
|
(let* ((os (image-operating-system image))
|
|
|
|
|
(schema (local-file (search-path %load-path
|
|
|
|
|
"guix/store/schema.sql")))
|
|
|
|
|
(graph (match inputs
|
|
|
|
|
(((names . _) ...)
|
|
|
|
|
names)))
|
2020-06-22 15:40:10 +00:00
|
|
|
|
(type (partition-file-system partition))
|
|
|
|
|
(image-builder
|
2020-04-28 12:15:28 +00:00
|
|
|
|
(with-imported-modules*
|
2020-06-22 15:40:10 +00:00
|
|
|
|
(let ((initializer #$(partition-initializer partition))
|
2020-06-23 07:51:20 +00:00
|
|
|
|
(inputs '#+(list e2fsprogs fakeroot dosfstools mtools))
|
2020-06-22 15:40:10 +00:00
|
|
|
|
(image-root "tmp-root"))
|
2020-04-28 12:15:28 +00:00
|
|
|
|
(sql-schema #$schema)
|
|
|
|
|
|
2020-06-22 15:40:10 +00:00
|
|
|
|
(set-path-environment-variable "PATH" '("bin" "sbin") inputs)
|
|
|
|
|
|
2020-04-28 12:15:28 +00:00
|
|
|
|
;; Allow non-ASCII file names--e.g., 'nss-certs'--to be
|
|
|
|
|
;; decoded.
|
|
|
|
|
(setenv "GUIX_LOCPATH"
|
|
|
|
|
#+(file-append glibc-utf8-locales "/lib/locale"))
|
|
|
|
|
(setlocale LC_ALL "en_US.utf8")
|
|
|
|
|
|
2020-06-22 15:40:10 +00:00
|
|
|
|
(initializer image-root
|
2020-04-28 12:15:28 +00:00
|
|
|
|
#:references-graphs '#$graph
|
|
|
|
|
#:deduplicate? #f
|
|
|
|
|
#:system-directory #$os
|
2020-05-23 17:10:04 +00:00
|
|
|
|
#:grub-efi #+grub-efi
|
2020-04-28 12:15:28 +00:00
|
|
|
|
#:bootloader-package
|
2020-05-23 17:09:53 +00:00
|
|
|
|
#+(bootloader-package bootloader)
|
|
|
|
|
#:bootloader-installer
|
|
|
|
|
#+(bootloader-installer bootloader)
|
2020-04-28 12:15:28 +00:00
|
|
|
|
#:bootcfg #$bootcfg
|
|
|
|
|
#:bootcfg-location
|
2020-06-22 15:40:10 +00:00
|
|
|
|
#$(bootloader-configuration-file bootloader))
|
2020-04-28 12:15:28 +00:00
|
|
|
|
(make-partition-image #$(partition->gexp partition)
|
|
|
|
|
#$output
|
2020-06-22 15:40:10 +00:00
|
|
|
|
image-root)))))
|
|
|
|
|
(computed-file "partition.img" image-builder
|
2020-08-27 04:40:52 +00:00
|
|
|
|
#:options `(#:references-graphs ,inputs))))
|
2020-04-28 12:15:28 +00:00
|
|
|
|
|
|
|
|
|
(define (partition->config partition)
|
|
|
|
|
;; Return the genimage partition configuration for PARTITION.
|
|
|
|
|
(let ((label (partition-label partition))
|
|
|
|
|
(dos-type (partition->dos-type partition))
|
2020-05-20 14:09:53 +00:00
|
|
|
|
(image (partition-image partition))
|
|
|
|
|
(offset (partition-offset partition)))
|
2020-04-28 12:15:28 +00:00
|
|
|
|
#~(format #f "~/partition ~a {
|
2020-05-23 17:09:58 +00:00
|
|
|
|
~/~/partition-type = ~a
|
|
|
|
|
~/~/image = \"~a\"
|
|
|
|
|
~/~/offset = \"~a\"
|
|
|
|
|
~/}"
|
2020-05-20 14:09:53 +00:00
|
|
|
|
#$label
|
|
|
|
|
#$dos-type
|
|
|
|
|
#$image
|
2020-05-26 11:05:22 +00:00
|
|
|
|
#$offset)))
|
2020-04-28 12:15:28 +00:00
|
|
|
|
|
|
|
|
|
(let* ((format (image-format image))
|
|
|
|
|
(image-type (format->image-type format))
|
|
|
|
|
(partitions (image-partitions image))
|
|
|
|
|
(partitions-config (map partition->config partitions))
|
|
|
|
|
(builder
|
|
|
|
|
#~(begin
|
|
|
|
|
(let ((format (@ (ice-9 format) format)))
|
|
|
|
|
(call-with-output-file #$output
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(format port
|
|
|
|
|
"\
|
|
|
|
|
image ~a {
|
|
|
|
|
~/~a {}
|
|
|
|
|
~{~a~^~%~}
|
|
|
|
|
}~%" #$genimage-name #$image-type (list #$@partitions-config))))))))
|
|
|
|
|
(computed-file "genimage.cfg" builder)))
|
|
|
|
|
|
2020-06-26 08:05:58 +00:00
|
|
|
|
(let* ((image-name (image-name image))
|
|
|
|
|
(name (if image-name
|
|
|
|
|
(symbol->string image-name)
|
|
|
|
|
name))
|
2020-09-29 09:37:19 +00:00
|
|
|
|
(format (image-format image))
|
2020-06-26 07:04:43 +00:00
|
|
|
|
(substitutable? (image-substitutable? image))
|
2020-04-28 12:15:28 +00:00
|
|
|
|
(builder
|
|
|
|
|
(with-imported-modules*
|
2020-09-29 09:37:19 +00:00
|
|
|
|
(let ((inputs '#+(list genimage coreutils findutils qemu-minimal))
|
2020-05-23 17:09:14 +00:00
|
|
|
|
(bootloader-installer
|
2020-09-29 09:37:19 +00:00
|
|
|
|
#+(bootloader-disk-image-installer bootloader))
|
|
|
|
|
(out-image (string-append "images/" #$genimage-name)))
|
2020-04-28 12:15:28 +00:00
|
|
|
|
(set-path-environment-variable "PATH" '("bin" "sbin") inputs)
|
2020-09-29 09:37:19 +00:00
|
|
|
|
(genimage #$(image->genimage-cfg image))
|
2020-05-23 17:09:14 +00:00
|
|
|
|
;; Install the bootloader directly on the disk-image.
|
|
|
|
|
(when bootloader-installer
|
|
|
|
|
(bootloader-installer
|
|
|
|
|
#+(bootloader-package bootloader)
|
|
|
|
|
#$(root-partition-index image)
|
2020-09-29 09:37:19 +00:00
|
|
|
|
out-image))
|
|
|
|
|
(convert-disk-image out-image '#$format #$output)))))
|
|
|
|
|
(computed-file name builder
|
2020-08-27 04:40:52 +00:00
|
|
|
|
#:options `(#:substitutable? ,substitutable?))))
|
2020-04-28 12:15:28 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
;; ISO9660 image.
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
(define (has-guix-service-type? os)
|
|
|
|
|
"Return true if OS contains a service of the type GUIX-SERVICE-TYPE."
|
|
|
|
|
(not (not (srfi-1:find (lambda (service)
|
|
|
|
|
(eq? (service-kind service) guix-service-type))
|
|
|
|
|
(operating-system-services os)))))
|
|
|
|
|
|
|
|
|
|
(define* (system-iso9660-image image
|
|
|
|
|
#:key
|
2020-09-19 12:24:59 +00:00
|
|
|
|
(name "image.iso")
|
2020-04-28 12:15:28 +00:00
|
|
|
|
bootcfg
|
|
|
|
|
bootloader
|
|
|
|
|
register-closures?
|
|
|
|
|
(inputs '())
|
|
|
|
|
(grub-mkrescue-environment '()))
|
|
|
|
|
"Return as a file-like object a bootable, stand-alone iso9660 image.
|
|
|
|
|
|
|
|
|
|
INPUTS is a list of inputs (as for packages). When REGISTER-CLOSURES? is
|
|
|
|
|
true, register INPUTS in the store database of the image so that Guix can be
|
|
|
|
|
used in the image. "
|
|
|
|
|
(define root-label
|
|
|
|
|
(match (image-partitions image)
|
|
|
|
|
((partition)
|
|
|
|
|
(partition-label partition))))
|
|
|
|
|
|
|
|
|
|
(define root-uuid
|
|
|
|
|
(match (image-partitions image)
|
|
|
|
|
((partition)
|
|
|
|
|
(uuid-bytevector (partition-uuid partition)))))
|
|
|
|
|
|
|
|
|
|
(let* ((os (image-operating-system image))
|
|
|
|
|
(bootloader (bootloader-package bootloader))
|
|
|
|
|
(compression? (image-compression? image))
|
|
|
|
|
(substitutable? (image-substitutable? image))
|
|
|
|
|
(schema (local-file (search-path %load-path
|
|
|
|
|
"guix/store/schema.sql")))
|
|
|
|
|
(graph (match inputs
|
|
|
|
|
(((names . _) ...)
|
|
|
|
|
names)))
|
|
|
|
|
(builder
|
|
|
|
|
(with-imported-modules*
|
|
|
|
|
(let* ((inputs '#$(list parted e2fsprogs dosfstools xorriso
|
2020-06-22 14:14:01 +00:00
|
|
|
|
sed grep coreutils findutils gawk))
|
|
|
|
|
(image-root "tmp-root"))
|
|
|
|
|
(sql-schema #$schema)
|
|
|
|
|
|
|
|
|
|
;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded.
|
|
|
|
|
(setenv "GUIX_LOCPATH"
|
|
|
|
|
#+(file-append glibc-utf8-locales "/lib/locale"))
|
|
|
|
|
|
|
|
|
|
(setlocale LC_ALL "en_US.utf8")
|
|
|
|
|
|
2020-04-28 12:15:28 +00:00
|
|
|
|
(set-path-environment-variable "PATH" '("bin" "sbin") inputs)
|
2020-06-22 14:14:01 +00:00
|
|
|
|
|
|
|
|
|
(initialize-root-partition image-root
|
|
|
|
|
#:references-graphs '#$graph
|
|
|
|
|
#:deduplicate? #f
|
|
|
|
|
#:system-directory #$os)
|
2020-04-28 12:15:28 +00:00
|
|
|
|
(make-iso9660-image #$xorriso
|
|
|
|
|
'#$grub-mkrescue-environment
|
|
|
|
|
#$bootloader
|
|
|
|
|
#$bootcfg
|
|
|
|
|
#$os
|
2020-06-22 14:14:01 +00:00
|
|
|
|
image-root
|
2020-04-28 12:15:28 +00:00
|
|
|
|
#$output
|
|
|
|
|
#:references-graphs '#$graph
|
|
|
|
|
#:register-closures? #$register-closures?
|
|
|
|
|
#:compression? #$compression?
|
|
|
|
|
#:volume-id #$root-label
|
|
|
|
|
#:volume-uuid #$root-uuid)))))
|
|
|
|
|
(computed-file name builder
|
2020-08-27 04:40:52 +00:00
|
|
|
|
#:options `(#:references-graphs ,inputs
|
2020-04-28 12:15:28 +00:00
|
|
|
|
#:substitutable? ,substitutable?))))
|
|
|
|
|
|
2020-08-29 13:34:56 +00:00
|
|
|
|
(define (image-with-label base-image label)
|
|
|
|
|
"The volume ID of an ISO is the label of the first partition. This procedure
|
|
|
|
|
returns an image record where the first partition's label is set to <label>."
|
|
|
|
|
(image
|
|
|
|
|
(inherit base-image)
|
|
|
|
|
(partitions
|
|
|
|
|
(match (image-partitions base-image)
|
|
|
|
|
((boot others ...)
|
|
|
|
|
(cons
|
|
|
|
|
(partition
|
|
|
|
|
(inherit boot)
|
|
|
|
|
(label label))
|
|
|
|
|
others))))))
|
|
|
|
|
|
2020-04-28 12:15:28 +00:00
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
;; Image creation.
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
(define (image->root-file-system image)
|
|
|
|
|
"Return the IMAGE root partition file-system type."
|
|
|
|
|
(let ((format (image-format image)))
|
|
|
|
|
(if (eq? format 'iso9660)
|
|
|
|
|
"iso9660"
|
|
|
|
|
(partition-file-system (find-root-partition image)))))
|
|
|
|
|
|
|
|
|
|
(define (root-size image)
|
|
|
|
|
"Return the root partition size of IMAGE."
|
|
|
|
|
(let* ((image-size (image-size image))
|
|
|
|
|
(root-partition (find-root-partition image))
|
|
|
|
|
(root-size (partition-size root-partition)))
|
|
|
|
|
(cond
|
|
|
|
|
((and (eq? root-size 'guess) image-size)
|
|
|
|
|
image-size)
|
|
|
|
|
(else root-size))))
|
|
|
|
|
|
system: image: Add image-type support.
* gnu/system/image.scm (image-with-os): New macro. Rename the old
"image-with-os" procedure to ...
(image-with-os*): ... this new procedure,
(system-image): adapt according,
(raw-image-type, iso-image-type, uncompressed-iso-image-type
%image-types): new variables,
(lookup-image-type-by-name): new procedure.
(find-image): remove it.
* gnu/system/images/hurd.scm (hurd-image-type): New variable,
use it to define ...
(hurd-disk-image): ... this variable, using "os->image" procedure.
* gnu/tests/install.scm (run-install): Rename
installation-disk-image-file-system-type parameter to installation-image-type,
use os->config instead of find-image to compute the image passed to system-image,
(%test-iso-image-installer) adapt accordingly,
(guided-installation-test): ditto.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-07-31 14:49:28 +00:00
|
|
|
|
(define* (image-with-os* base-image os)
|
2020-04-28 12:15:28 +00:00
|
|
|
|
"Return an image based on BASE-IMAGE but with the operating-system field set
|
|
|
|
|
to OS. Also set the UUID and the size of the root partition."
|
|
|
|
|
(define root-file-system
|
|
|
|
|
(srfi-1:find
|
|
|
|
|
(lambda (fs)
|
|
|
|
|
(string=? (file-system-mount-point fs) "/"))
|
|
|
|
|
(operating-system-file-systems os)))
|
|
|
|
|
|
2020-05-23 17:10:07 +00:00
|
|
|
|
(image
|
|
|
|
|
(inherit base-image)
|
|
|
|
|
(operating-system os)
|
|
|
|
|
(partitions
|
|
|
|
|
(map (lambda (p)
|
|
|
|
|
(if (root-partition? p)
|
|
|
|
|
(partition
|
|
|
|
|
(inherit p)
|
|
|
|
|
(uuid (file-system-device root-file-system))
|
|
|
|
|
(size (root-size base-image)))
|
|
|
|
|
p))
|
|
|
|
|
(image-partitions base-image)))))
|
2020-04-28 12:15:28 +00:00
|
|
|
|
|
|
|
|
|
(define (operating-system-for-image image)
|
|
|
|
|
"Return an operating-system based on the one specified in IMAGE, but
|
|
|
|
|
suitable for image creation. Assign an UUID to the root file-system, so that
|
|
|
|
|
it can be used for bootloading."
|
|
|
|
|
(define volatile-root? (image-volatile-root? image))
|
|
|
|
|
|
|
|
|
|
(define (root-uuid os)
|
|
|
|
|
;; UUID of the root file system, computed in a deterministic fashion.
|
|
|
|
|
;; This is what we use to locate the root file system so it has to be
|
|
|
|
|
;; different from the user's own file system UUIDs.
|
|
|
|
|
(let ((type (if (eq? (image-format image) 'iso9660)
|
|
|
|
|
'iso9660
|
|
|
|
|
'dce)))
|
|
|
|
|
(operating-system-uuid os type)))
|
|
|
|
|
|
|
|
|
|
(let* ((root-file-system-type (image->root-file-system image))
|
|
|
|
|
(base-os (image-operating-system image))
|
|
|
|
|
(file-systems-to-keep
|
|
|
|
|
(srfi-1:remove
|
|
|
|
|
(lambda (fs)
|
|
|
|
|
(string=? (file-system-mount-point fs) "/"))
|
|
|
|
|
(operating-system-file-systems base-os)))
|
|
|
|
|
(format (image-format image))
|
|
|
|
|
(os
|
|
|
|
|
(operating-system
|
|
|
|
|
(inherit base-os)
|
|
|
|
|
(initrd (lambda (file-systems . rest)
|
|
|
|
|
(apply (operating-system-initrd base-os)
|
|
|
|
|
file-systems
|
|
|
|
|
#:volatile-root? volatile-root?
|
|
|
|
|
rest)))
|
|
|
|
|
(bootloader (if (eq? format 'iso9660)
|
|
|
|
|
(bootloader-configuration
|
|
|
|
|
(inherit
|
|
|
|
|
(operating-system-bootloader base-os))
|
|
|
|
|
(bootloader grub-mkrescue-bootloader))
|
|
|
|
|
(operating-system-bootloader base-os)))
|
|
|
|
|
(file-systems (cons (file-system
|
|
|
|
|
(mount-point "/")
|
|
|
|
|
(device "/dev/placeholder")
|
|
|
|
|
(type root-file-system-type))
|
|
|
|
|
file-systems-to-keep))))
|
|
|
|
|
(uuid (root-uuid os)))
|
|
|
|
|
(operating-system
|
|
|
|
|
(inherit os)
|
|
|
|
|
(file-systems (cons (file-system
|
|
|
|
|
(mount-point "/")
|
|
|
|
|
(device uuid)
|
|
|
|
|
(type root-file-system-type))
|
|
|
|
|
file-systems-to-keep)))))
|
|
|
|
|
|
2020-05-23 17:10:28 +00:00
|
|
|
|
(define* (system-image image)
|
2020-04-28 12:15:28 +00:00
|
|
|
|
"Return the derivation of IMAGE. It can be a raw disk-image or an ISO9660
|
|
|
|
|
image, depending on IMAGE format."
|
|
|
|
|
(define substitutable? (image-substitutable? image))
|
2020-06-14 15:59:07 +00:00
|
|
|
|
(define target (image-target image))
|
|
|
|
|
|
|
|
|
|
(with-parameters ((%current-target-system target))
|
|
|
|
|
(let* ((os (operating-system-for-image image))
|
system: image: Add image-type support.
* gnu/system/image.scm (image-with-os): New macro. Rename the old
"image-with-os" procedure to ...
(image-with-os*): ... this new procedure,
(system-image): adapt according,
(raw-image-type, iso-image-type, uncompressed-iso-image-type
%image-types): new variables,
(lookup-image-type-by-name): new procedure.
(find-image): remove it.
* gnu/system/images/hurd.scm (hurd-image-type): New variable,
use it to define ...
(hurd-disk-image): ... this variable, using "os->image" procedure.
* gnu/tests/install.scm (run-install): Rename
installation-disk-image-file-system-type parameter to installation-image-type,
use os->config instead of find-image to compute the image passed to system-image,
(%test-iso-image-installer) adapt accordingly,
(guided-installation-test): ditto.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-07-31 14:49:28 +00:00
|
|
|
|
(image* (image-with-os* image os))
|
2020-09-29 09:37:19 +00:00
|
|
|
|
(image-format (image-format image))
|
2020-06-14 15:59:07 +00:00
|
|
|
|
(register-closures? (has-guix-service-type? os))
|
|
|
|
|
(bootcfg (operating-system-bootcfg os))
|
|
|
|
|
(bootloader (bootloader-configuration-bootloader
|
|
|
|
|
(operating-system-bootloader os))))
|
2020-09-29 09:37:19 +00:00
|
|
|
|
(cond
|
|
|
|
|
((memq image-format '(disk-image compressed-qcow2))
|
2020-06-13 12:01:18 +00:00
|
|
|
|
(system-disk-image image*
|
|
|
|
|
#:bootcfg bootcfg
|
|
|
|
|
#:bootloader bootloader
|
|
|
|
|
#:register-closures? register-closures?
|
|
|
|
|
#:inputs `(("system" ,os)
|
|
|
|
|
("bootcfg" ,bootcfg))))
|
2020-09-29 09:37:19 +00:00
|
|
|
|
((memq image-format '(iso9660))
|
2020-06-13 12:01:18 +00:00
|
|
|
|
(system-iso9660-image
|
|
|
|
|
image*
|
|
|
|
|
#:bootcfg bootcfg
|
|
|
|
|
#:bootloader bootloader
|
|
|
|
|
#:register-closures? register-closures?
|
|
|
|
|
#:inputs `(("system" ,os)
|
|
|
|
|
("bootcfg" ,bootcfg))
|
|
|
|
|
;; Make sure to use a mode that does no imply
|
|
|
|
|
;; HFS+ tree creation that may fail with:
|
|
|
|
|
;;
|
|
|
|
|
;; "libisofs: FAILURE : Too much files to mangle,
|
|
|
|
|
;; cannot guarantee unique file names"
|
|
|
|
|
;;
|
|
|
|
|
;; This happens if some limits are exceeded, see:
|
|
|
|
|
;; https://lists.gnu.org/archive/html/grub-devel/2020-06/msg00048.html
|
|
|
|
|
#:grub-mkrescue-environment
|
|
|
|
|
'(("MKRESCUE_SED_MODE" . "mbr_only"))))))))
|
2020-04-28 12:15:28 +00:00
|
|
|
|
|
system: image: Add image-type support.
* gnu/system/image.scm (image-with-os): New macro. Rename the old
"image-with-os" procedure to ...
(image-with-os*): ... this new procedure,
(system-image): adapt according,
(raw-image-type, iso-image-type, uncompressed-iso-image-type
%image-types): new variables,
(lookup-image-type-by-name): new procedure.
(find-image): remove it.
* gnu/system/images/hurd.scm (hurd-image-type): New variable,
use it to define ...
(hurd-disk-image): ... this variable, using "os->image" procedure.
* gnu/tests/install.scm (run-install): Rename
installation-disk-image-file-system-type parameter to installation-image-type,
use os->config instead of find-image to compute the image passed to system-image,
(%test-iso-image-installer) adapt accordingly,
(guided-installation-test): ditto.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-07-31 14:49:28 +00:00
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
;; Image detection.
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
(define (image-modules)
|
|
|
|
|
"Return the list of image modules."
|
|
|
|
|
(cons (resolve-interface '(gnu system image))
|
|
|
|
|
(all-modules (map (lambda (entry)
|
|
|
|
|
`(,entry . "gnu/system/images/"))
|
|
|
|
|
%load-path)
|
|
|
|
|
#:warn warn-about-load-error)))
|
|
|
|
|
|
|
|
|
|
(define %image-types
|
|
|
|
|
;; The list of publically-known image types.
|
|
|
|
|
(delay (fold-module-public-variables (lambda (obj result)
|
|
|
|
|
(if (image-type? obj)
|
|
|
|
|
(cons obj result)
|
|
|
|
|
result))
|
|
|
|
|
'()
|
|
|
|
|
(image-modules))))
|
|
|
|
|
|
|
|
|
|
(define (lookup-image-type-by-name name)
|
|
|
|
|
"Return the image type called NAME."
|
|
|
|
|
(or (srfi-1:find (lambda (image-type)
|
|
|
|
|
(eq? name (image-type-name image-type)))
|
|
|
|
|
(force %image-types))
|
|
|
|
|
(raise
|
|
|
|
|
(formatted-message (G_ "~a: no such image type~%") name))))
|
2020-04-28 12:15:28 +00:00
|
|
|
|
|
|
|
|
|
;;; image.scm ends here
|