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

guix system: Factorize 'grub-install' error handling, and use more 'mbegin'. 

* guix/scripts/system.scm (install-grub*): New procedure.
  (install): Use it, and use 'mwhen?'.
  (perform-action) <reconfigure>: Likewise.
This commit is contained in:
Ludovic Courtès 2014-12-04 19:14:07 +01:00
parent bb986599e6
commit c3e79cde06
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
guix/scripts/system.scm
View File

@ -131,6 +131,14 @@ TARGET, and register them."
(map (cut copy-item <> target #:log-port log-port) (map (cut copy-item <> target #:log-port log-port)
to-copy)))) to-copy))))
(define (install-grub* grub.cfg device target)
"This is a variant of 'install-grub' with error handling, lifted in
%STORE-MONAD"
(with-monad %store-monad
(unless (false-if-exception (install-grub grub.cfg device target))
(leave (_ "failed to install GRUB on device '~a'~%") device))
(return #t)))
(define* (install os-drv target (define* (install os-drv target
#:key (log-port (current-output-port)) #:key (log-port (current-output-port))
grub? grub.cfg device) grub? grub.cfg device)
@ -162,11 +170,8 @@ When GRUB? is true, install GRUB on DEVICE, using GRUB.CFG."
(format log-port "populating '~a'...~%" target) (format log-port "populating '~a'...~%" target)
(populate os-dir target) (populate os-dir target)
(begin (mwhen grub?
(when grub? (install-grub* grub.cfg device target)))))
(unless (false-if-exception (install-grub grub.cfg device target))
(leave (_ "failed to install GRUB on device '~a'~%") device)))
(return #t)))))
;;; ;;;
@ -338,14 +343,11 @@ boot directly to the kernel or to the bootloader."
(case action (case action
((reconfigure) ((reconfigure)
(mlet %store-monad ((% (switch-to-system os))) (mbegin %store-monad
(when grub? (switch-to-system os)
(unless (false-if-exception (mwhen grub?
(install-grub (derivation->output-path grub.cfg) (install-grub* (derivation->output-path grub.cfg)
device "/")) device "/"))))
(leave (_ "failed to install GRUB on device '~a'~%")
device)))
(return #t)))
((init) ((init)
(newline) (newline)
(format #t (_ "initializing operating system under '~a'...~%") (format #t (_ "initializing operating system under '~a'...~%")