diff options
| author | Zheng Junjie <zhengjunjie@iscas.ac.cn> | 2024-03-19 23:18:36 +0800 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-03-31 22:26:27 +0200 |
| commit | a5deb90fd45872e0f4e3c2446b9848e1ea592068 (patch) | |
| tree | 11e03ca581ea6b7ad9ef1233775219c904c7cebd /gnu/system/vm.scm | |
| parent | 64187b65d3acb13b91dd83fc8e7209c8ef538078 (diff) | |
vm: use #$ for kernel-arguments.
Use #$ allow cross-compile to with support current system kernel.
e.g. linux-libre-riscv64-generic.
* gnu/system/vm.scm(system-qemu-image/shared-store-script)
(linux-image-startup-command): use #$ for kernel-arguments.
Change-Id: I9d2e7df296ce590b95cd30996b33f8ca692ac1b1
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/system/vm.scm')
| -rw-r--r-- | gnu/system/vm.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index fcfd1cdb485..40e965d2726 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> | 5 | ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> |
| 6 | ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> | 6 | ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> |
| 7 | ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> | 7 | ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> |
| 8 | ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> | ||
| 8 | ;;; | 9 | ;;; |
| 9 | ;;; This file is part of GNU Guix. | 10 | ;;; This file is part of GNU Guix. |
| 10 | ;;; | 11 | ;;; |
| @@ -270,7 +271,7 @@ useful when FULL-BOOT? is true." | |||
| 270 | (volatile-root? volatile?))))) | 271 | (volatile-root? volatile?))))) |
| 271 | (define kernel-arguments | 272 | (define kernel-arguments |
| 272 | #~(list #$@(if graphic? #~() #~("console=ttyS0")) | 273 | #~(list #$@(if graphic? #~() #~("console=ttyS0")) |
| 273 | #+@(operating-system-kernel-arguments os "/dev/vda1"))) | 274 | #$@(operating-system-kernel-arguments os "/dev/vda1"))) |
| 274 | 275 | ||
| 275 | (define rw-image | 276 | (define rw-image |
| 276 | #~(format #f "/tmp/guix-image-~a" (basename #$base-image))) | 277 | #~(format #f "/tmp/guix-image-~a" (basename #$base-image))) |
| @@ -340,7 +341,7 @@ host." | |||
| 340 | 341 | ||
| 341 | (define kernel-arguments | 342 | (define kernel-arguments |
| 342 | #~(list #$@(if graphic? #~() #~("console=ttyS0")) | 343 | #~(list #$@(if graphic? #~() #~("console=ttyS0")) |
| 343 | #+@(operating-system-kernel-arguments os "/dev/vda1"))) | 344 | #$@(operating-system-kernel-arguments os "/dev/vda1"))) |
| 344 | 345 | ||
| 345 | #~`(#+(file-append qemu "/bin/" | 346 | #~`(#+(file-append qemu "/bin/" |
| 346 | (qemu-command (or target system))) | 347 | (qemu-command (or target system))) |
