nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

system: 'read-boot-parameters' reads the 'initrd' parameter. 

* gnu/system.scm (<boot-parameters>)[initrd]: New field.
(read-boot-parameters): Read the 'initrd' element and fill in the
'initrd' field of the result.
This commit is contained in:
Ludovic Courtès 2016-09-24 17:39:00 +09:00
parent 6fc48c2ee2
commit d7b342d815
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/system.scm
View File

@ -101,6 +101,7 @@
boot-parameters-root-device boot-parameters-root-device
boot-parameters-kernel boot-parameters-kernel
boot-parameters-kernel-arguments boot-parameters-kernel-arguments
boot-parameters-initrd
read-boot-parameters read-boot-parameters
local-host-aliases local-host-aliases
@ -770,7 +771,8 @@ this file is the reconstruction of GRUB menu entries for old configurations."
(label boot-parameters-label) (label boot-parameters-label)
(root-device boot-parameters-root-device) (root-device boot-parameters-root-device)
(kernel boot-parameters-kernel) (kernel boot-parameters-kernel)
(kernel-arguments boot-parameters-kernel-arguments)) (kernel-arguments boot-parameters-kernel-arguments)
(initrd boot-parameters-initrd))
(define (read-boot-parameters port) (define (read-boot-parameters port)
"Read boot parameters from PORT and return the corresponding "Read boot parameters from PORT and return the corresponding
@ -794,7 +796,14 @@ this file is the reconstruction of GRUB menu entries for old configurations."
(kernel-arguments (kernel-arguments
(match (assq 'kernel-arguments rest) (match (assq 'kernel-arguments rest)
((_ args) args) ((_ args) args)
(#f '()))))) ;the old format (#f '()))) ;the old format
(initrd
(match (assq 'initrd rest)
(('initrd ('string-append directory file)) ;the old format
(string-append directory file))
(('initrd (? string? file))
file)))))
(x ;unsupported format (x ;unsupported format
(warning (_ "unrecognized boot parameters for '~a'~%") (warning (_ "unrecognized boot parameters for '~a'~%")
system) system)