aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-12-07 15:12:21 +0100
committerLudovic Courtès <ludo@gnu.org>2018-12-07 15:14:12 +0100
commit6ddc63e599a26c302f74d0622f67cfd987f0dc5f (patch)
tree634fec4a9b442f64b230a330b64d39dbe5f1c33a
parent6eac835f178c0c78637b0db8a4585a617b2f7622 (diff)
downloadguix-6ddc63e599a26c302f74d0622f67cfd987f0dc5f.tar.gz
guix-6ddc63e599a26c302f74d0622f67cfd987f0dc5f.zip
guix system: Fix bootloader config file generation by 'guix system roll-back'.
Fixes <https://bugs.gnu.org/33623>. Reported by Diego Nicola Barbato <dnbarbato@posteo.de>. Regression introduced in commit 46c296dcc4817f15a4b4ef7e5ef622306b4db62e. * guix/scripts/system.scm (reinstall-bootloader): Add call to 'lower-object'.
-rw-r--r--guix/scripts/system.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index d92ec7d5a5..8eb32c62bc 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -497,9 +497,10 @@ STORE is an open connection to the store."
(old-entries (map boot-parameters->menu-entry old-params)))
(run-with-store store
(mlet* %store-monad
- ((bootcfg ((bootloader-configuration-file-generator bootloader)
- bootloader-config entries
- #:old-entries old-entries))
+ ((bootcfg (lower-object
+ ((bootloader-configuration-file-generator bootloader)
+ bootloader-config entries
+ #:old-entries old-entries)))
(bootcfg-file -> (bootloader-configuration-file bootloader))
(target -> "/")
(drvs -> (list bootcfg)))