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

scripts: system: Introduce profile-boot-parameters. 

* guix/scripts/system.scm (profile-boot-parameters): New variable.
(reinstall-grub): Use profile-boot-parameters.
(perform-action): Use profile-boot-parameters.

Follow-up to 2e58e05bb6.
This commit is contained in:
Danny Milosavljevic 2017-04-15 19:34:00 +02:00
parent 8c326cf644
commit abae042ea4
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
guix/scripts/system.scm
View File

@ -363,6 +363,24 @@ it atomically, and then run OS's activation script."
(date->string (time-utc->date time) (date->string (time-utc->date time)
"~Y-~m-~d ~H:~M"))) "~Y-~m-~d ~H:~M")))
(define* (profile-boot-parameters #:optional (profile %system-profile)
(numbers (generation-numbers profile)))
"Return a list of 'menu-entry' for the generations of PROFILE specified by
NUMBERS, which is a list of generation numbers."
(define (system->boot-parameters system number time)
(unless-file-not-found
(let* ((file (string-append system "/parameters"))
(params (call-with-input-file file
read-boot-parameters)))
params)))
(let* ((systems (map (cut generation-file-name profile <>)
numbers))
(times (map (lambda (system)
(unless-file-not-found
(stat:mtime (lstat system))))
systems)))
(filter-map system->boot-parameters systems numbers times)))
(define* (profile-grub-entries #:optional (profile %system-profile) (define* (profile-grub-entries #:optional (profile %system-profile)
(numbers (generation-numbers profile))) (numbers (generation-numbers profile)))
"Return a list of 'menu-entry' for the generations of PROFILE specified by "Return a list of 'menu-entry' for the generations of PROFILE specified by
@ -438,9 +456,9 @@ open connection to the store."
;; from the actual past values for this generation's entry. ;; from the actual past values for this generation's entry.
(grub-config (grub-configuration (device root-device))) (grub-config (grub-configuration (device root-device)))
;; Make the specified system generation the default entry. ;; Make the specified system generation the default entry.
(entries (profile-grub-entries %system-profile (list number))) (entries (profile-boot-parameters %system-profile (list number)))
(old-generations (delv number (generation-numbers %system-profile))) (old-generations (delv number (generation-numbers %system-profile)))
(old-entries (profile-grub-entries %system-profile old-generations)) (old-entries (profile-boot-parameters %system-profile old-generations))
(grub.cfg (run-with-store store (grub.cfg (run-with-store store
(grub-configuration-file grub-config (grub-configuration-file grub-config
entries entries
@ -625,7 +643,7 @@ output when building a system derivation, such as a disk image."
(operating-system-bootcfg os (operating-system-bootcfg os
(if (eq? 'init action) (if (eq? 'init action)
'() '()
(profile-grub-entries))))) (profile-boot-parameters)))))
;; 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