* [bug#57496] [PATCH 1/2] gnu: bootloader: Extend `<menu-entry>' for chain-loader.
[not found] <cover.1661918556.git.typ22@foxmail.com>
@ 2022-08-31 5:27 ` typ22
2022-08-31 7:18 ` Julien Lepiller
2022-08-31 5:27 ` [bug#57496] [PATCH 2/2] gnu: bootloader: grub: Add support " typ22
1 sibling, 1 reply; 4+ messages in thread
From: typ22 @ 2022-08-31 5:27 UTC (permalink / raw)
To: 57496; +Cc: tiantian
From: tiantian <typ22@foxmail.com>
* gnu/bootloader.scm (<menu-entry>)[chain-loader]: New field.
(menu-entry->sexp, sexp->menu-entry): Support chain-loader.
* doc/guix.texi (Bootloader Configuration): Document it.
---
doc/guix.texi | 15 +++++++++++++++
gnu/bootloader.scm | 40 ++++++++++++++++++++++++++++++++++------
2 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 957b9a668e..69dcd9e7b9 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -37536,6 +37536,21 @@ Bootloader Configuration
@dots{}))
@end lisp
+@item @code{chain-loader} (default: @code{#f})
+A string that any accepted by @code{chainloader}. If there are items
+other than @code{label} and @code{device}, it will have no effect.
+
+@lisp
+(bootloader
+ (bootloader-configuration
+ ;; @dots{}
+ (menu-entries
+ (list
+ (menu-entry
+ (label "GNU/Linux")
+ (chain-loader "(hd0,gpt1)/EFI/GNULinux/grubx64.efi"))))))
+@end lisp
+
@end table
@end deftp
diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm
index 77c05e8946..41f690a4dc 100644
--- a/gnu/bootloader.scm
+++ b/gnu/bootloader.scm
@@ -46,6 +46,7 @@ (define-module (gnu bootloader)
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-arguments
(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 <string>
+ (chain-loader menu-entry-chain-loader
+ (default #f))) ; string, path of efi file
+
(define (menu-entry->sexp entry)
"Return ENTRY serialized as an sexp."
@@ -117,8 +121,15 @@ (define (menu-entry->sexp entry)
`(label ,(file-system-label->string label)))
(_ device)))
(match entry
- (($ <menu-entry> label device mount-point linux linux-arguments initrd #f
- ())
+ ;; Fields of <menu-entry> in the patterns is incomplete,
+ ;; resulting in menu-entry with chain-loader incorrectly
+ ;; matching the first.
+ ;; To keep pattern is short and keep matching order,
+ ;; judge an important field in each pattern.
+ ;; Such as kernel.
+ (($ <menu-entry> label device mount-point
+ (? identity linux) linux-arguments initrd
+ #f ())
`(menu-entry (version 0)
(label ,label)
(device ,(device->sexp device))
@@ -127,14 +138,22 @@ (define (menu-entry->sexp entry)
(linux-arguments ,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)
(multiboot-arguments ,multiboot-arguments)
- (multiboot-modules ,multiboot-modules)))))
+ (multiboot-modules ,multiboot-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-loader)))))
(define (sexp->menu-entry sexp)
"Turn SEXP, an sexp as returned by 'menu-entry->sexp', into a <menu-entry>
@@ -171,7 +190,16 @@ (define (sexp->menu-entry sexp)
(device-mount-point mount-point)
(multiboot-kernel multiboot-kernel)
(multiboot-arguments multiboot-arguments)
- (multiboot-modules multiboot-modules)))))
+ (multiboot-modules multiboot-modules)))
+ (('menu-entry ('version 0)
+ ('label label) ('device device)
+ ('device-mount-point mount-point)
+ ('chain-loader chain-loader) _ ...)
+ (menu-entry
+ (label label)
+ (device (sexp->device device))
+ (device-mount-point mount-point)
+ (chain-loader chain-loader)))))
\f
;;;
--
2.37.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#57496] [PATCH 2/2] gnu: bootloader: grub: Add support for chain-loader.
[not found] <cover.1661918556.git.typ22@foxmail.com>
2022-08-31 5:27 ` [bug#57496] [PATCH 1/2] gnu: bootloader: Extend `<menu-entry>' for chain-loader typ22
@ 2022-08-31 5:27 ` typ22
1 sibling, 0 replies; 4+ messages in thread
From: typ22 @ 2022-08-31 5:27 UTC (permalink / raw)
To: 57496; +Cc: tiantian
From: tiantian <typ22@foxmail.com>
* gnu/bootloader/grub.scm (grub-configuration-file): Add support for
chain-loader.
---
gnu/bootloader/grub.scm | 73 ++++++++++++++++++++++++-----------------
1 file changed, 43 insertions(+), 30 deletions(-)
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index 4f18c9b518..7283257354 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -374,44 +374,57 @@ (define* (grub-configuration-file config entries
(let ((label (menu-entry-label entry))
(linux (menu-entry-linux entry))
(device (menu-entry-device entry))
- (device-mount-point (menu-entry-device-mount-point entry)))
- (if linux
- (let ((arguments (menu-entry-linux-arguments entry))
- (linux (normalize-file linux
- device-mount-point
- store-directory-prefix))
- (initrd (normalize-file (menu-entry-initrd entry)
- device-mount-point
- store-directory-prefix)))
- ;; Here DEVICE is the store and DEVICE-MOUNT-POINT is its mount point.
- ;; Use the right file names for LINUX and INITRD in case
- ;; DEVICE-MOUNT-POINT is not "/", meaning that the store is on a
- ;; separate partition.
-
- ;; When BTRFS-SUBVOLUME-FILE-NAME is defined, prepend it the linux and
- ;; initrd paths, to allow booting from a Btrfs subvolume.
- #~(format port "menuentry ~s {
+ (device-mount-point (menu-entry-device-mount-point entry))
+ (multiboot-kernel (menu-entry-multiboot-kernel entry))
+ (chain-loader (menu-entry-chain-loader entry)))
+ (cond
+ (linux
+ (let ((arguments (menu-entry-linux-arguments entry))
+ (linux (normalize-file linux
+ device-mount-point
+ store-directory-prefix))
+ (initrd (normalize-file (menu-entry-initrd entry)
+ device-mount-point
+ store-directory-prefix)))
+ ;; Here DEVICE is the store and DEVICE-MOUNT-POINT is its mount point.
+ ;; Use the right file names for LINUX and INITRD in case
+ ;; DEVICE-MOUNT-POINT is not "/", meaning that the store is on a
+ ;; separate partition.
+
+ ;; When BTRFS-SUBVOLUME-FILE-NAME is defined, prepend it the linux and
+ ;; initrd paths, to allow booting from a Btrfs subvolume.
+ #~(format port "menuentry ~s {
~a
linux ~a ~a
initrd ~a
}~%"
- #$label
- #$(grub-root-search device linux)
- #$linux (string-join (list #$@arguments))
- #$initrd))
- (let ((kernel (menu-entry-multiboot-kernel entry))
- (arguments (menu-entry-multiboot-arguments entry))
- (modules (menu-entry-multiboot-modules entry))
- (root-index 1)) ; XXX EFI will need root-index 2
- #~(format port "
+ #$label
+ #$(grub-root-search device linux)
+ #$linux (string-join (list #$@arguments))
+ #$initrd)))
+ (multiboot-kernel
+ (let ((kernel (menu-entry-multiboot-kernel entry))
+ (arguments (menu-entry-multiboot-arguments entry))
+ (modules (menu-entry-multiboot-modules entry))
+ (root-index 1)) ; XXX EFI will need root-index 2
+ #~(format port "
menuentry ~s {
multiboot ~a root=device:hd0s~a~a~a
+}~%"
+ #$label
+ #$kernel
+ #$root-index (string-join (list #$@arguments) " " 'prefix)
+ (string-join (map string-join '#$modules)
+ "\n module " 'prefix))))
+ (chain-loader
+ #~(format port "
+menuentry ~s {
+ ~a
+ chainloader ~a
}~%"
#$label
- #$kernel
- #$root-index (string-join (list #$@arguments) " " 'prefix)
- (string-join (map string-join '#$modules)
- "\n module " 'prefix))))))
+ #$(grub-root-search device chain-loader)
+ #$chain-loader)))))
(define (crypto-devices)
(define (crypto-device->cryptomount dev)
--
2.37.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#57496] [PATCH 1/2] gnu: bootloader: Extend `<menu-entry>' for chain-loader.
2022-08-31 5:27 ` [bug#57496] [PATCH 1/2] gnu: bootloader: Extend `<menu-entry>' for chain-loader typ22
@ 2022-08-31 7:18 ` Julien Lepiller
2022-08-31 7:45 ` Julien Lepiller
0 siblings, 1 reply; 4+ messages in thread
From: Julien Lepiller @ 2022-08-31 7:18 UTC (permalink / raw)
To: 57496, typ22; +Cc: tiantian
[-- Attachment #1: Type: text/plain, Size: 6099 bytes --]
Hi tiantian!
Thanks for the patches. It's a bit hard to follow since I'm not at a computer, but here are some preliminary remarks.
First, thanks for documenting the change in the manual, it's not something even I think about all the time ^^'. We'll have to rework the English a bit but it's understandable :)
I'm wondering why there are two patches? The first patch below seems documented but the second patch does not have a changelog text. Shouldn't they be merged? They seem to be for the same thing.
From what I understand, specifying chainloader with at least linux or linux-multiboot will lead to chainloader being silently dropped. Maybe we should have an error message instead?
I'm not too familiar with chainloading. Is using grub partition names like (hd0,gpt1) the only way? We try to discourage using these names as they can easily vary between reboots and your system unbootable.
Otherwise, it looks fine at first glance, but untested :)
Le 31 août 2022 07:27:48 GMT+02:00, typ22@foxmail.com a écrit :
>From: tiantian <typ22@foxmail.com>
>
>* gnu/bootloader.scm (<menu-entry>)[chain-loader]: New field.
>(menu-entry->sexp, sexp->menu-entry): Support chain-loader.
>* doc/guix.texi (Bootloader Configuration): Document it.
>---
> doc/guix.texi | 15 +++++++++++++++
> gnu/bootloader.scm | 40 ++++++++++++++++++++++++++++++++++------
> 2 files changed, 49 insertions(+), 6 deletions(-)
>
>diff --git a/doc/guix.texi b/doc/guix.texi
>index 957b9a668e..69dcd9e7b9 100644
>--- a/doc/guix.texi
>+++ b/doc/guix.texi
>@@ -37536,6 +37536,21 @@ Bootloader Configuration
> @dots{}))
> @end lisp
>
>+@item @code{chain-loader} (default: @code{#f})
>+A string that any accepted by @code{chainloader}. If there are items
>+other than @code{label} and @code{device}, it will have no effect.
>+
>+@lisp
>+(bootloader
>+ (bootloader-configuration
>+ ;; @dots{}
>+ (menu-entries
>+ (list
>+ (menu-entry
>+ (label "GNU/Linux")
>+ (chain-loader "(hd0,gpt1)/EFI/GNULinux/grubx64.efi"))))))
>+@end lisp
>+
> @end table
> @end deftp
>
>diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm
>index 77c05e8946..41f690a4dc 100644
>--- a/gnu/bootloader.scm
>+++ b/gnu/bootloader.scm
>@@ -46,6 +46,7 @@ (define-module (gnu bootloader)
> 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-arguments
> (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 <string>
>+ (chain-loader menu-entry-chain-loader
>+ (default #f))) ; string, path of efi file
>+
>
> (define (menu-entry->sexp entry)
> "Return ENTRY serialized as an sexp."
>@@ -117,8 +121,15 @@ (define (menu-entry->sexp entry)
> `(label ,(file-system-label->string label)))
> (_ device)))
> (match entry
>- (($ <menu-entry> label device mount-point linux linux-arguments initrd #f
>- ())
>+ ;; Fields of <menu-entry> in the patterns is incomplete,
>+ ;; resulting in menu-entry with chain-loader incorrectly
>+ ;; matching the first.
>+ ;; To keep pattern is short and keep matching order,
>+ ;; judge an important field in each pattern.
>+ ;; Such as kernel.
>+ (($ <menu-entry> label device mount-point
>+ (? identity linux) linux-arguments initrd
>+ #f ())
> `(menu-entry (version 0)
> (label ,label)
> (device ,(device->sexp device))
>@@ -127,14 +138,22 @@ (define (menu-entry->sexp entry)
> (linux-arguments ,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)
> (multiboot-arguments ,multiboot-arguments)
>- (multiboot-modules ,multiboot-modules)))))
>+ (multiboot-modules ,multiboot-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-loader)))))
>
> (define (sexp->menu-entry sexp)
> "Turn SEXP, an sexp as returned by 'menu-entry->sexp', into a <menu-entry>
>@@ -171,7 +190,16 @@ (define (sexp->menu-entry sexp)
> (device-mount-point mount-point)
> (multiboot-kernel multiboot-kernel)
> (multiboot-arguments multiboot-arguments)
>- (multiboot-modules multiboot-modules)))))
>+ (multiboot-modules multiboot-modules)))
>+ (('menu-entry ('version 0)
>+ ('label label) ('device device)
>+ ('device-mount-point mount-point)
>+ ('chain-loader chain-loader) _ ...)
>+ (menu-entry
>+ (label label)
>+ (device (sexp->device device))
>+ (device-mount-point mount-point)
>+ (chain-loader chain-loader)))))
>
> \f>
> ;;;
>--
>2.37.2
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 6641 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#57496] [PATCH 1/2] gnu: bootloader: Extend `<menu-entry>' for chain-loader.
2022-08-31 7:18 ` Julien Lepiller
@ 2022-08-31 7:45 ` Julien Lepiller
0 siblings, 0 replies; 4+ messages in thread
From: Julien Lepiller @ 2022-08-31 7:45 UTC (permalink / raw)
To: 57496, typ22; +Cc: tiantian
Le 31 août 2022 09:18:44 GMT+02:00, Julien Lepiller <julien@lepiller.eu> a écrit :
>Hi tiantian!
>
>Thanks for the patches. It's a bit hard to follow since I'm not at a computer, but here are some preliminary remarks.
>
>First, thanks for documenting the change in the manual, it's not something even I think about all the time ^^'. We'll have to rework the English a bit but it's understandable :)
>
>I'm wondering why there are two patches? The first patch below seems documented but the second patch does not have a changelog text. Shouldn't they be merged? They seem to be for the same thing.
Nevesmind, I don't know how I missed it, there is a changelog for that patch. I still think it could be merged with the first. Or any reason to keep it separate?
>
>From what I understand, specifying chainloader with at least linux or linux-multiboot will lead to chainloader being silently dropped. Maybe we should have an error message instead?
>
>I'm not too familiar with chainloading. Is using grub partition names like (hd0,gpt1) the only way? We try to discourage using these names as they can easily vary between reboots and your system unbootable.
>
>Otherwise, it looks fine at first glance, but untested :)
>
>Le 31 août 2022 07:27:48 GMT+02:00, typ22@foxmail.com a écrit :
>>From: tiantian <typ22@foxmail.com>
>>
>>* gnu/bootloader.scm (<menu-entry>)[chain-loader]: New field.
>>(menu-entry->sexp, sexp->menu-entry): Support chain-loader.
>>* doc/guix.texi (Bootloader Configuration): Document it.
>>---
>> doc/guix.texi | 15 +++++++++++++++
>> gnu/bootloader.scm | 40 ++++++++++++++++++++++++++++++++++------
>> 2 files changed, 49 insertions(+), 6 deletions(-)
>>
>>diff --git a/doc/guix.texi b/doc/guix.texi
>>index 957b9a668e..69dcd9e7b9 100644
>>--- a/doc/guix.texi
>>+++ b/doc/guix.texi
>>@@ -37536,6 +37536,21 @@ Bootloader Configuration
>> @dots{}))
>> @end lisp
>>
>>+@item @code{chain-loader} (default: @code{#f})
>>+A string that any accepted by @code{chainloader}. If there are items
>>+other than @code{label} and @code{device}, it will have no effect.
>>+
>>+@lisp
>>+(bootloader
>>+ (bootloader-configuration
>>+ ;; @dots{}
>>+ (menu-entries
>>+ (list
>>+ (menu-entry
>>+ (label "GNU/Linux")
>>+ (chain-loader "(hd0,gpt1)/EFI/GNULinux/grubx64.efi"))))))
>>+@end lisp
>>+
>> @end table
>> @end deftp
>>
>>diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm
>>index 77c05e8946..41f690a4dc 100644
>>--- a/gnu/bootloader.scm
>>+++ b/gnu/bootloader.scm
>>@@ -46,6 +46,7 @@ (define-module (gnu bootloader)
>> 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-arguments
>> (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 <string>
>>+ (chain-loader menu-entry-chain-loader
>>+ (default #f))) ; string, path of efi file
>>+
>>
>> (define (menu-entry->sexp entry)
>> "Return ENTRY serialized as an sexp."
>>@@ -117,8 +121,15 @@ (define (menu-entry->sexp entry)
>> `(label ,(file-system-label->string label)))
>> (_ device)))
>> (match entry
>>- (($ <menu-entry> label device mount-point linux linux-arguments initrd #f
>>- ())
>>+ ;; Fields of <menu-entry> in the patterns is incomplete,
>>+ ;; resulting in menu-entry with chain-loader incorrectly
>>+ ;; matching the first.
>>+ ;; To keep pattern is short and keep matching order,
>>+ ;; judge an important field in each pattern.
>>+ ;; Such as kernel.
>>+ (($ <menu-entry> label device mount-point
>>+ (? identity linux) linux-arguments initrd
>>+ #f ())
>> `(menu-entry (version 0)
>> (label ,label)
>> (device ,(device->sexp device))
>>@@ -127,14 +138,22 @@ (define (menu-entry->sexp entry)
>> (linux-arguments ,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)
>> (multiboot-arguments ,multiboot-arguments)
>>- (multiboot-modules ,multiboot-modules)))))
>>+ (multiboot-modules ,multiboot-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-loader)))))
>>
>> (define (sexp->menu-entry sexp)
>> "Turn SEXP, an sexp as returned by 'menu-entry->sexp', into a <menu-entry>
>>@@ -171,7 +190,16 @@ (define (sexp->menu-entry sexp)
>> (device-mount-point mount-point)
>> (multiboot-kernel multiboot-kernel)
>> (multiboot-arguments multiboot-arguments)
>>- (multiboot-modules multiboot-modules)))))
>>+ (multiboot-modules multiboot-modules)))
>>+ (('menu-entry ('version 0)
>>+ ('label label) ('device device)
>>+ ('device-mount-point mount-point)
>>+ ('chain-loader chain-loader) _ ...)
>>+ (menu-entry
>>+ (label label)
>>+ (device (sexp->device device))
>>+ (device-mount-point mount-point)
>>+ (chain-loader chain-loader)))))
>>
>> \f>>
>> ;;;
>>--
>>2.37.2
>>
>>
>>
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-08-31 7:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <cover.1661918556.git.typ22@foxmail.com>
2022-08-31 5:27 ` [bug#57496] [PATCH 1/2] gnu: bootloader: Extend `<menu-entry>' for chain-loader typ22
2022-08-31 7:18 ` Julien Lepiller
2022-08-31 7:45 ` Julien Lepiller
2022-08-31 5:27 ` [bug#57496] [PATCH 2/2] gnu: bootloader: grub: Add support " typ22
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.