diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2022-01-13 11:06:31 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2022-01-13 11:11:02 +0100 |
| commit | ea71ec1630e06503c14c6e7f4570b69de4e42123 (patch) | |
| tree | 7b8d132af4866841f36674f1776f2eeb4702b5a2 /gnu/bootloader | |
| parent | 4addc484b94dfd4d6c83bd85ad76aeb586d2ee13 (diff) | |
| download | guix-ea71ec1630e06503c14c6e7f4570b69de4e42123.tar.gz guix-ea71ec1630e06503c14c6e7f4570b69de4e42123.zip | |
bootloader: grub: Fix serial mode.
* gnu/bootloader/grub.scm (grub-setup-io): Fix serial mode display by
declaring the serial property before the terminal_input and terminal_output
properties.
Diffstat (limited to 'gnu/bootloader')
| -rw-r--r-- | gnu/bootloader/grub.scm | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 42f71aa4db..120cd55012 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -264,36 +264,38 @@ is a string that can be inserted in grub.cfg." at_keyboard usb_keyboard)) (io (string-append - "terminal_output " - (symbols->string - (map - (lambda (output) - (if (memq output valid-outputs) output #f)) outputs)) "\n" - (if (null? inputs) - "" - (string-append - "terminal_input " - (symbols->string - (map - (lambda (input) - (if (memq input valid-inputs) input #f)) inputs)) "\n")) - ;; UNIT and SPEED are arguments to the same GRUB command - ;; ("serial"), so we process them together. - (if (or unit speed) - (string-append + ;; UNIT and SPEED are arguments to the same GRUB command + ;; ("serial"), so we process them together. + (if (or unit speed) + (string-append "serial" (if unit - ;; COM ports 1 through 4 - (if (and (exact-integer? unit) (<= unit 3) (>= unit 0)) - (string-append " --unit=" (number->string unit)) - #f) - "") + ;; COM ports 1 through 4 + (if (and (exact-integer? unit) (<= unit 3) (>= unit 0)) + (string-append " --unit=" (number->string unit)) + #f) + "") (if speed - (if (exact-integer? speed) - (string-append " --speed=" (number->string speed)) - #f) - "")) - "")))) + (if (exact-integer? speed) + (string-append " --speed=" (number->string speed)) + #f) + "") + "\n") + "") + (if (null? inputs) + "" + (string-append + "terminal_input " + (symbols->string + (map + (lambda (input) + (if (memq input valid-inputs) input #f)) inputs)) + "\n")) + "terminal_output " + (symbols->string + (map + (lambda (output) + (if (memq output valid-outputs) output #f)) outputs))))) (format #f "~a" io))) (define (grub-root-search device file) |