nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

system: Rename operating-system-grub.cfg to operating-system-bootcfg. 

* gnu/system.scm (operating-system-grub.cfg): Rename to...
(operating-system-bootcfg): ... this.
* gnu/system/vm.scm (system-disk-image): Use operating-system-bootcfg.
(system-qemu-image): Use operating-system-bootcfg.
(system-qemu-image/shared-store): Use operating-system-bootcfg.
* guix/scripts/system.scm (perform-action): Use operating-system-bootcfg.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
This commit is contained in:
Mathieu Othacehe 2017-04-02 15:52:29 +02:00 committed by Danny Milosavljevic
parent 03daeaa70f
commit c76b3046f6
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/system.scm
View File

@ -3,6 +3,7 @@
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -92,7 +93,7 @@
operating-system-derivation operating-system-derivation
operating-system-profile operating-system-profile
operating-system-grub.cfg operating-system-bootcfg
operating-system-etc-directory operating-system-etc-directory
operating-system-locale-directory operating-system-locale-directory
operating-system-boot-script operating-system-boot-script
@ -728,9 +729,9 @@ listed in OS. The C library expects to find it under
"Return the file system that contains the store of OS." "Return the file system that contains the store of OS."
(store-file-system (operating-system-file-systems os))) (store-file-system (operating-system-file-systems os)))
(define* (operating-system-grub.cfg os #:optional (old-entries '())) (define* (operating-system-bootcfg os #:optional (old-entries '()))
"Return the GRUB configuration file for OS. Use OLD-ENTRIES to populate the "Return the bootloader configuration file for OS. Use OLD-ENTRIES to
\"old entries\" menu." populate the \"old entries\" menu."
(mlet* %store-monad (mlet* %store-monad
((system (operating-system-derivation os)) ((system (operating-system-derivation os))
(root-fs -> (operating-system-root-file-system os)) (root-fs -> (operating-system-root-file-system os))

18
gnu/system/vm.scm
View File

@ -284,10 +284,10 @@ to USB sticks meant to be read-only."
file-systems-to-keep))))) file-systems-to-keep)))))
(mlet* %store-monad ((os-drv (operating-system-derivation os)) (mlet* %store-monad ((os-drv (operating-system-derivation os))
(grub.cfg (operating-system-grub.cfg os))) (bootcfg (operating-system-bootcfg os)))
(qemu-image #:name name (qemu-image #:name name
#:os-derivation os-drv #:os-derivation os-drv
#:grub-configuration grub.cfg #:grub-configuration bootcfg
#:disk-image-size disk-image-size #:disk-image-size disk-image-size
#:disk-image-format "raw" #:disk-image-format "raw"
#:file-system-type file-system-type #:file-system-type file-system-type
@ -295,7 +295,7 @@ to USB sticks meant to be read-only."
#:copy-inputs? #t #:copy-inputs? #t
#:register-closures? #t #:register-closures? #t
#:inputs `(("system" ,os-drv) #:inputs `(("system" ,os-drv)
("grub.cfg" ,grub.cfg)))))) ("grub.cfg" ,bootcfg))))))
(define* (system-qemu-image os (define* (system-qemu-image os
#:key #:key
@ -328,13 +328,13 @@ of the GNU system as described by OS."
file-systems-to-keep))))) file-systems-to-keep)))))
(mlet* %store-monad (mlet* %store-monad
((os-drv (operating-system-derivation os)) ((os-drv (operating-system-derivation os))
(grub.cfg (operating-system-grub.cfg os))) (bootcfg (operating-system-bootcfg os)))
(qemu-image #:os-derivation os-drv (qemu-image #:os-derivation os-drv
#:grub-configuration grub.cfg #:grub-configuration bootcfg
#:disk-image-size disk-image-size #:disk-image-size disk-image-size
#:file-system-type file-system-type #:file-system-type file-system-type
#:inputs `(("system" ,os-drv) #:inputs `(("system" ,os-drv)
("grub.cfg" ,grub.cfg)) ("grub.cfg" ,bootcfg))
#:copy-inputs? #t)))) #:copy-inputs? #t))))
@ -423,16 +423,16 @@ When FULL-BOOT? is true, return an image that does a complete boot sequence,
bootloaded included; thus, make a disk image that contains everything the bootloaded included; thus, make a disk image that contains everything the
bootloader refers to: OS kernel, initrd, bootloader data, etc." bootloader refers to: OS kernel, initrd, bootloader data, etc."
(mlet* %store-monad ((os-drv (operating-system-derivation os)) (mlet* %store-monad ((os-drv (operating-system-derivation os))
(grub.cfg (operating-system-grub.cfg os))) (bootcfg (operating-system-bootcfg os)))
;; XXX: When FULL-BOOT? is true, we end up creating an image that contains ;; XXX: When FULL-BOOT? is true, we end up creating an image that contains
;; GRUB.CFG and all its dependencies, including the output of OS-DRV. ;; GRUB.CFG and all its dependencies, including the output of OS-DRV.
;; This is more than needed (we only need the kernel, initrd, GRUB for its ;; This is more than needed (we only need the kernel, initrd, GRUB for its
;; font, and the background image), but it's hard to filter that. ;; font, and the background image), but it's hard to filter that.
(qemu-image #:os-derivation os-drv (qemu-image #:os-derivation os-drv
#:grub-configuration grub.cfg #:grub-configuration bootcfg
#:disk-image-size disk-image-size #:disk-image-size disk-image-size
#:inputs (if full-boot? #:inputs (if full-boot?
`(("grub.cfg" ,grub.cfg)) `(("grub.cfg" ,bootcfg))
'()) '())
;; XXX: Passing #t here is too slow, so let it off by default. ;; XXX: Passing #t here is too slow, so let it off by default.

8
guix/scripts/system.scm
View File

@ -622,10 +622,10 @@ output when building a system derivation, such as a disk image."
(operating-system-bootloader os)))) (operating-system-bootloader os))))
(grub.cfg (if (eq? 'container action) (grub.cfg (if (eq? 'container action)
(return #f) (return #f)
(operating-system-grub.cfg os (operating-system-bootcfg os
(if (eq? 'init action) (if (eq? 'init action)
'() '()
(profile-grub-entries))))) (profile-grub-entries)))))
;; For 'init' and 'reconfigure', always build GRUB.CFG, even if ;; For 'init' and 'reconfigure', always build GRUB.CFG, even if
;; --no-grub is passed, because GRUB.CFG because we then use it as a GC ;; --no-grub is passed, because GRUB.CFG because we then use it as a GC