From c3e79cde060a4dbbadd15235c6ea61aa8600cffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 4 Dec 2014 19:14:07 +0100
Subject: [PATCH] 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.
---
guix/scripts/system.scm | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 8e049a4f45f..35f858cf297 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -131,6 +131,14 @@ (define* (copy-closure item target
(map (cut copy-item <> target #:log-port log-port)
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
#:key (log-port (current-output-port))
grub? grub.cfg device)
@@ -162,11 +170,8 @@ (define (maybe-copy to-copy)
(format log-port "populating '~a'...~%" target)
(populate os-dir target)
- (begin
- (when grub?
- (unless (false-if-exception (install-grub grub.cfg device target))
- (leave (_ "failed to install GRUB on device '~a'~%") device)))
- (return #t)))))
+ (mwhen grub?
+ (install-grub* grub.cfg device target)))))
;;;
@@ -338,14 +343,11 @@ (define* (perform-action action os
(case action
((reconfigure)
- (mlet %store-monad ((% (switch-to-system os)))
- (when grub?
- (unless (false-if-exception
- (install-grub (derivation->output-path grub.cfg)
- device "/"))
- (leave (_ "failed to install GRUB on device '~a'~%")
- device)))
- (return #t)))
+ (mbegin %store-monad
+ (switch-to-system os)
+ (mwhen grub?
+ (install-grub* (derivation->output-path grub.cfg)
+ device "/"))))
((init)
(newline)
(format #t (_ "initializing operating system under '~a'...~%")
--
GitLab