diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-07-17 01:07:50 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-07-17 01:11:06 +0200 |
| commit | ee2a6304f3bcf19df895310aedff372ed7e17c34 (patch) | |
| tree | a1faa13fb55276d7fbb97917657d872148acd750 /gnu/system | |
| parent | 2378df558a6ca9c1db889294cc08b1229720e912 (diff) | |
system: Add 'kernel-arguments' field.
* gnu/system.scm (<operating-system>)[kernel-arguments]: New field.
(operating-system-grub.cfg): Honor it.
(operating-system-parameters-file): Add 'kernel-arguments' to the parameters
file.
* guix/scripts/system.scm (previous-grub-entries)[system->grub-entry]: Read
the 'kernel-arguments' field of the parameters file, when available.
* gnu/system/vm.scm (system-qemu-image/shared-store-script):
Use (operating-system-kernel-arguments os) in '-append'.
* doc/guix.texi (operating-system Reference): Document it.
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/vm.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 2520493e2e..b293009127 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -493,7 +493,8 @@ exec " #$qemu "/bin/" #$(qemu-command (%current-system)) #~(" -kernel " #$(operating-system-kernel os) "/bzImage \ -initrd " #$os-drv "/initrd \ -append \"" #$(if graphic? "" "console=ttyS0 ") - "--system=" #$os-drv " --load=" #$os-drv "/boot --root=/dev/vda1\" ")) + "--system=" #$os-drv " --load=" #$os-drv "/boot --root=/dev/vda1 " + (string-join (list #+@(operating-system-kernel-arguments os))) "\" ")) #$(common-qemu-options image (map file-system-mapping-source (cons %store-mapping mappings))) |