Le 31 ao=C3=BBt 2022 07:27:48 GMT+02:00, typ22@foxmail=2E= com a =C3=A9crit=C2=A0:
From: tiantian <typ22@foxmail=2Ecom&=
gt;

* gnu/bootloader=2Escm (<menu-entry>)[chain-loader]: New f=
ield=2E
(menu-entry->sexp, sexp->menu-entry): Support chain-loader=
=2E
* doc/guix=2Etexi (Bootloader Configuration): Document it=2E doc=
/guix=2Etexi      | 15 +++++++++++++++
 gnu/bootloader=2Escm | 40 ++++++=
++++++++++++++++++++++++++++------
 2 files changed, 49 insertions(+), 6=
 deletions(-)

diff --git a/doc/guix=2Etexi b/doc/guix=2Etexi
inde=
x 957b9a668e=2E=2E69dcd9e7b9 100644
--- a/doc/guix=2Etexi
+++ b/doc/g=
uix=2Etexi
@@ -37536,6 +37536,21 @@ Bootloader Configuration
        =
      @dots{}))
 @end lisp
 
+@item @code{chain-loader} (default: =
@code{#f})
+A string that any accepted by @code{chainloader}=2E If there=
 are items
+other than @code{label} and @code{device}, it will have no e=
ffect=2E
+
+@lisp
+(bootloader
+  (bootloader-configuration
=
+  ;; @dots{}
+    (menu-entries
+      (list
+        (menu-entry=

+          (label "GNU/Linux")
+          (chain-loader "(hd0,gpt1)/=
EFI/GNULinux/grubx64=2Eefi"))))))
+@end lisp
+
 @end table
 @en=
d deftp
 
diff --git a/gnu/bootloader=2Escm b/gnu/bootloader=2Escmindex 77c05e8946=2E=2E41f690a4dc 100644
--- a/gnu/bootloader=2Escm
+=
++ b/gnu/bootloader=2Escm
@@ -46,6 +46,7 @@ (define-module (gnu bootload=
er)
             menu-entry-multiboot-kernel
             menu-entry-=
multiboot-arguments
             menu-entry-multiboot-modules
+      =
      menu-entry-chain-loader
 
             menu-entry->sexp
 =
            sexp->menu-entry
@@ -104,8 +105,11 @@ (define-record-type=
* <menu-entry>
   (multiboot-arguments menu-entry-multiboot-argume=
nts
                        (default '()))      ; list of string-valued =
gexps
   (multiboot-modules menu-entry-multiboot-modules
-           =
          (default '())))       ; list of multiboot commands, where
+   =
                  (default '()))        ; list of multiboot commands, where=

                                            ; a command is a list of &l=
t;string>
+  (chain-loader     menu-entry-chain-loader
+          =
          (default #f)))         ; string, path of efi file
+
 
 (=
define (menu-entry->sexp entry)
   "Return ENTRY serialized as an sex=
p=2E"
@@ -117,8 +121,15 @@ (define (menu-entry->sexp entry)
      =
  `(label ,(file-system-label->string label)))
       (_ device)))   (match entry
-    (($ <menu-entry> label device mount-point li=
nux linux-arguments initrd #f
-                     ())
+    ;; Field=
s of <menu-entry> in the patterns is incomplete,
+    ;; resulting=
 in menu-entry with chain-loader incorrectly
+    ;; matching the first=
=2E
+    ;; To keep pattern is short and keep matching order,
+    ;;=
 judge an important field in each pattern=2E
+    ;; Such as kernel=2E+    (($ <menu-entry> label device mount-point
+                =
     (? identity linux) linux-arguments initrd
+                     #f =
())
      `(menu-entry (version 0)
                   (label ,label)<=
br>                   (device ,(device->sexp device))
@@ -127,14 +138=
,22 @@ (define (menu-entry->sexp entry)
                   (linux-arg=
uments ,linux-arguments)
                   (initrd ,initrd)))
     (=
($ <menu-entry> label device mount-point #f () #f
-               =
      multiboot-kernel multiboot-arguments multiboot-modules)
+         =
            (? identity multiboot-kernel) multiboot-arguments
+         =
            multiboot-modules)
      `(menu-entry (version 0)
       =
            (label ,label)
                   (device ,(device->sexp =
device))
                   (device-mount-point ,mount-point)
       =
            (multiboot-kernel ,multiboot-kernel)
                   (mul=
tiboot-arguments ,multiboot-arguments)
-                  (multiboot-mod=
ules ,multiboot-modules)))))
+                  (multiboot-modules ,mult=
iboot-modules)))
+    (($ <menu-entry> label device mount-point #f=
 () #f #f () ()
+                     (? identity chain-loader))
+   =
  `(menu-entry (version 0)
+                  (label ,label)
+       =
           (device ,(device->sexp device))
+                  (device=
-mount-point ,mount-point)
+                  (chain-loader ,chain-loade=
r)))))
 
 (define (sexp->menu-entry sexp)
   "Turn SEXP, an sex=
p as returned by 'menu-entry->sexp', into a <menu-entry>
@@ -17=
1,7 +190,16 @@ (define (sexp->menu-entry sexp)
       (device-mount-p=
oint mount-point)
       (multiboot-kernel multiboot-kernel)
       (=
multiboot-arguments multiboot-arguments)
-      (multiboot-modules multi=
boot-modules)))))
+      (multiboot-modules multiboot-modules)))
+   =
 (('menu-entry ('version 0)
+                  ('label label) ('device d=
evice)
+                  ('device-mount-point mount-point)
+        =
          ('chain-loader chain-loader) _ =2E=2E=2E)
+     (menu-entry+      (label label)
+      (device (sexp->device device))
+     =
 (device-mount-point mount-point)
+      (chain-loader chain-loader)))))=

 
 
 ;;;
-- 
2=2E37=2E=
2