[PATCH 0/3] Add image-type support.

index dc66f2c533..6f8f4828ac 100644

image-partitions

image-compression?

image-volatile-root?



;;;

(default #t))

(substitutable? image-substitutable? ;boolean

(default #t)))

--

2.26.2

index 36f56e237d..deee8a6412 100644

;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.

(define-module (gnu system image)

#:use-module (guix gexp)

#:use-module (guix modules)

#:use-module (guix monads)

efi-disk-image

iso9660-image



;;;

(label "GUIX_IMAGE")

(flags '(boot)))))))



;;

;; Helpers.

image-size)

(else root-size))))

"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

(with-parameters ((%current-target-system target))

(let* ((os (operating-system-for-image image))

(register-closures? (has-guix-service-type? os))

(bootcfg (operating-system-bootcfg os))

(bootloader (bootloader-configuration-bootloader

#:grub-mkrescue-environment

'(("MKRESCUE_SED_MODE" . "mbr_only"))))))))

;;; image.scm ends here

diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm

index d87640e8e3..67f657d289 100644

#:use-module (gnu system file-systems)

#:use-module (gnu system hurd)

#:use-module (gnu system image)

#:export (hurd-barebones-os

hurd-disk-image

hurd-barebones-disk-image))

(define hurd-barebones-os

(flags '(boot))

(initializer hurd-initialize-root-partition))))))

(define hurd-barebones-disk-image

(image

diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm

index 9656e5f41f..0be9ee2892 100644

#:imported-modules '((gnu services herd)

(gnu installer tests)

(guix combinators))))

(install-size 'guess)

(target-size (* 2200 MiB)))

"Run SCRIPT (a shell script following the system installation procedure) in

(mlet* %store-monad ((_ (set-grafting #f))

(system (current-system))

;; Since the installation system has no network access,

;; we cheat a little bit by adding TARGET to its GC

;; succeed. Also add guile-final, which is pulled in

;; through provenance.drv and may not always be present.

(target (operating-system-derivation target-os))

(image ->

(define install

(with-imported-modules '((guix build utils)

(gnu build marionette))

"-no-reboot"

"-m" "1200"

#$@(cond

#~("-drive"

,(string-append "file=" #$image

",if=virtio,readonly")))

#~("-cdrom" #$image))

(else

(error

"-drive"

,(string-append "file=" #$output ",if=virtio")

,@(if (file-exists? "/dev/kvm")

%minimal-os-on-vda-source

#:script

%simple-installation-script-for-/dev/vda

(command (qemu-command/writable-image image)))

(run-basic-test %minimal-os-on-vda command name)))))

#:os installation-os-for-gui-tests

#:install-size install-size

#:target-size target-size

#:gui-test

(lambda (marionette)

(gui-test-program

--

2.26.2

index bfd50c7a79..4962401f36 100644

;;; Action.

;;;

full-boot? container-shared-network?

mappings)

"Return as a monadic value the derivation for OS according to ACTION."

(lower-object

(system-image

(image

((docker-image)

(system-docker-image os #:shared-network? container-shared-network?))))

install-bootloader?

dry-run? derivations-only?

use-substitutes? bootloader-target target

(mappings '())

(gc-root #f))

"Perform ACTION for OS. INSTALL-BOOTLOADER? specifies whether to install

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

CONTAINER-SHARED-NETWORK? determines if the container will use a separate

network namespace.

(check-initrd-modules os)))

(mlet* %store-monad

#:image-size image-size

#:full-boot? full-boot?

#:container-shared-network? container-shared-network?

#:node-type (shepherd-service-node-type shepherds)

#:reverse-edges? #t)))



;;;

;;; Options.

apply STRATEGY (one of nothing-special, backtrace,

or debug) when an error occurs while reading FILE"))

(display (G_ "

(display (G_ "

--image-size=SIZE for 'vm-image', produce an image of SIZE"))

(display (G_ "

(lambda (opt name arg result)

(alist-cons 'on-error (string->symbol arg)

result)))

(lambda (opt name arg result)

result)))

(option '("image-size") #t #f

(lambda (opt name arg result)

(alist-cons 'image-size (size->number arg)

(debug . 0)

(verbosity . #f) ;default

(validate-reconfigure . ,ensure-forward-reconfigure)

(image-size . guess)

(install-bootloader? . #t)))

(assoc-ref opts 'skip-safety-checks?)

#:validate-reconfigure

(assoc-ref opts 'validate-reconfigure)

#:image-size (assoc-ref opts 'image-size)

#:full-boot? (assoc-ref opts 'full-boot?)

#:container-shared-network?

--

2.26.2