[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#29932] [PATCH 1/2] system: Inline operating-system-kernel-arguments
From: |
Danny Milosavljevic |
Subject: |
[bug#29932] [PATCH 1/2] system: Inline operating-system-kernel-arguments. |
Date: |
Mon, 1 Jan 2018 14:27:02 +0100 |
* gnu/system.scm (operating-system-kernel-arguments): Remove.
(bootable-kernel-arguments): Export.
(read-boot-parameters-file): Use bootable-kernel-arguments.
* gnu/system/vm.scm (system-qemu-image/shared-store-script): Use
bootable-kernel-arguments.
---
gnu/system.scm | 15 ++++++---------
gnu/system/vm.scm | 4 +++-
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index df89ca06d..42e0c37c1 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -117,7 +117,9 @@
local-host-aliases
%setuid-programs
%base-packages
- %base-firmware))
+ %base-firmware
+
+ bootable-kernel-arguments))
;;; Commentary:
;;;
@@ -200,13 +202,6 @@ booted from ROOT-DEVICE"
(sudoers-file operating-system-sudoers-file ; file-like
(default %sudoers-specification)))
-(define (operating-system-kernel-arguments os system.drv root-device)
- "Return all the kernel arguments, including the ones not specified
-directly by the user."
- (bootable-kernel-arguments (operating-system-user-kernel-arguments os)
- system.drv
- root-device))
-
;;;
;;; Boot parameters
@@ -940,7 +935,9 @@ kernel arguments for that derivation to <boot-parameters>."
(kernel (operating-system-kernel-file os))
(kernel-arguments
(if system.drv
- (operating-system-kernel-arguments os system.drv root-device)
+ (bootable-kernel-arguments
+ (operating-system-user-kernel-arguments os)
+ system.drv root-device)
(operating-system-user-kernel-arguments os)))
(initrd initrd)
(bootloader-name bootloader-name)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 53629daa9..323eceac5 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -704,7 +704,9 @@ it is mostly useful when FULL-BOOT? is true."
#:disk-image-size disk-image-size)))
(define kernel-arguments
#~(list #$@(if graphic? #~() #~("console=ttyS0"))
- #+@(operating-system-kernel-arguments os os-drv "/dev/vda1")))
+ #+@(bootable-kernel-arguments
+ (operating-system-user-kernel-arguments os)
+ os-drv "/dev/vda1")))
(define qemu-exec
#~(list (string-append #$qemu "/bin/" #$(qemu-command (%current-system)))
[bug#29932] [PATCH v2 1/2] system: Split up operating-system-kernel-arguments into operating-system-boot-kernel-arguments and operating-system-user-kernel-arguments., Danny Milosavljevic, 2018/01/12