diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-09-06 20:46:00 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2019-09-06 20:46:00 -0400 |
| commit | 65542a8852759f35e19959149ac92297c8b54be5 (patch) | |
| tree | bc8f398c7b10a4725b20aa59ab1452d30f358ea3 /gnu/system.scm | |
| parent | bc60349b5bc58a0b803df5adce1de6db82453744 (diff) | |
| parent | f66aee3d0d2f573187ed5d44ae7c13d73cd4097a (diff) | |
| download | guix-patches-65542a8852759f35e19959149ac92297c8b54be5.tar guix-patches-65542a8852759f35e19959149ac92297c8b54be5.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 485896ba0a..37573fd153 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -116,6 +116,7 @@ boot-parameters-label boot-parameters-root-device boot-parameters-bootloader-name + boot-parameters-bootloader-menu-entries boot-parameters-store-device boot-parameters-store-mount-point boot-parameters-kernel @@ -251,6 +252,8 @@ directly by the user." ;; OS's root file system, so it might be a device path like "/dev/sda3". (root-device boot-parameters-root-device) (bootloader-name boot-parameters-bootloader-name) + (bootloader-menu-entries ;list of <menu-entry> + boot-parameters-bootloader-menu-entries) (store-device boot-parameters-store-device) (store-mount-point boot-parameters-store-mount-point) (kernel boot-parameters-kernel) @@ -297,6 +300,11 @@ file system labels." ((_ args) args) (#f 'grub))) ; for compatibility reasons. + (bootloader-menu-entries + (match (assq 'bootloader-menu-entries rest) + ((_ entries) (map sexp->menu-entry entries)) + (#f '()))) + ;; In the past, we would store the directory name of the kernel instead ;; of the absolute file name of its image. Detect that and correct it. (kernel (if (string=? linux (direct-store-path linux)) @@ -1009,6 +1017,8 @@ such as '--root' and '--load' to <boot-parameters>." (operating-system-user-kernel-arguments os))) (initrd initrd) (bootloader-name bootloader-name) + (bootloader-menu-entries + (bootloader-configuration-menu-entries (operating-system-bootloader os))) (store-device (ensure-not-/dev (file-system-device store))) (store-mount-point (file-system-mount-point store))))) @@ -1050,6 +1060,11 @@ being stored into the \"parameters\" file)." #$(boot-parameters-kernel-arguments params)) (initrd #$(boot-parameters-initrd params)) (bootloader-name #$(boot-parameters-bootloader-name params)) + (bootloader-menu-entries + #$(map menu-entry->sexp + (or (and=> (operating-system-bootloader os) + bootloader-configuration-menu-entries) + '()))) (store (device #$(device->sexp (boot-parameters-store-device params))) |