amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

scripts: system: Add 'container' action.

Browse source 
* guix/scripts/system.scm (show-help): Display 'container' action.
  (system-derivation-for-action, guix-system): Add 'container' case.
  (perform-action): Skip GRUB config generation when building a container.
* doc/guix.texi (Invoking guix system): Document it.
This commit is contained in:
David Thompson 2015-06-08 09:04:38 -04:00 • committed by David Thompson
parent f535dcbe19
commit e086dcfcf9
3 changed files with 40 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
guix/scripts/system.scm
View file

@ -33,6 +33,7 @@
#:use-module (gnu build install)
#:use-module (gnu system)
#:use-module (gnu system file-systems)
#:use-module (gnu system linux-container)
#:use-module (gnu system vm)
#:use-module (gnu system grub)
#:use-module (gnu services)
@ -336,6 +337,8 @@ list of services."
(case action
((build init reconfigure)
(operating-system-derivation os))
((container)
(container-script os #:mappings mappings))
((vm-image)
(system-qemu-image os #:disk-image-size image-size))
((vm)
@ -368,10 +371,12 @@ building anything."
#:full-boot? full-boot?
#:mappings mappings))
(grub (package->derivation grub))
(grub.cfg (operating-system-grub.cfg os
(if (eq? 'init action)
'()
(previous-grub-entries))))
(grub.cfg (if (eq? 'container action)
(return #f)
(operating-system-grub.cfg os
(if (eq? 'init action)
'()
(previous-grub-entries)))))
(drvs -> (if (and grub? (memq action '(init reconfigure)))
(list sys grub grub.cfg)
(list sys)))
@ -451,6 +456,8 @@ Build the operating system declared in FILE according to ACTION.\n"))
reconfigure switch to a new operating system configuration\n"))
(display (_ "\
build build the operating system without installing anything\n"))
(display (_ "\
container build a Linux container that shares the host's store\n"))
(display (_ "\
vm build a virtual machine image that shares the host's store\n"))
(display (_ "\
@ -557,7 +564,7 @@ Build the operating system declared in FILE according to ACTION.\n"))
(alist-cons 'argument arg result)
(let ((action (string->symbol arg)))
(case action
((build vm vm-image disk-image reconfigure init
((build container vm vm-image disk-image reconfigure init
extension-graph dmd-graph)
(alist-cons 'action action result))
(else (leave (_ "~a: unknown action~%") action))))))
@ -586,7 +593,7 @@ Build the operating system declared in FILE according to ACTION.\n"))
(exit 1))
(case action
((build vm vm-image disk-image reconfigure)
((build container vm vm-image disk-image reconfigure)
(unless (= count 1)
(fail)))
((init)