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

guix system: Always add zero previous entries in grub.cfg for 'init'. 

* guix/scripts/system.scm (grub.cfg): Remove.
  (perform-action): Call 'operating-system-grub.cfg' with the empty list as
  the 2nd argument when ACTION is 'init.
This commit is contained in:
Ludovic Courtès 2015-05-24 17:15:16 +02:00
parent 4a1bf0907b
commit 328639e48f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/scripts/system.scm
View File

@ -284,10 +284,6 @@ it atomically, and then run OS's activation script."
((disk-image) ((disk-image)
(system-disk-image os #:disk-image-size image-size)))) (system-disk-image os #:disk-image-size image-size))))
(define (grub.cfg os)
"Return the GRUB configuration file for OS."
(operating-system-grub.cfg os (previous-grub-entries)))
(define* (maybe-build drvs (define* (maybe-build drvs
#:key dry-run? use-substitutes?) #:key dry-run? use-substitutes?)
"Show what will/would be built, and actually build DRVS, unless DRY-RUN? is "Show what will/would be built, and actually build DRVS, unless DRY-RUN? is
@ -317,7 +313,10 @@ boot directly to the kernel or to the bootloader."
#:full-boot? full-boot? #:full-boot? full-boot?
#:mappings mappings)) #:mappings mappings))
(grub (package->derivation grub)) (grub (package->derivation grub))
(grub.cfg (grub.cfg os)) (grub.cfg (operating-system-grub.cfg os
(if (eq? 'init action)
'()
(previous-grub-entries))))
(drvs -> (if (and grub? (memq action '(init reconfigure))) (drvs -> (if (and grub? (memq action '(init reconfigure)))
(list sys grub grub.cfg) (list sys grub grub.cfg)
(list sys))) (list sys)))