From: Danny Milosavljevic <dannym@scratchpost.org>
To: 29932@debbugs.gnu.org
Subject: [bug#29932] [PATCH 1/2] system: Inline operating-system-kernel-arguments.
Date: Mon, 1 Jan 2018 14:27:02 +0100 [thread overview]
Message-ID: <20180101132703.26309-1-dannym@scratchpost.org> (raw)
In-Reply-To: <20180101132200.26157-1-dannym@scratchpost.org>
* 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))
-
\f
;;;
;;; 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)))
next prev parent reply other threads:[~2018-01-01 13:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-01 13:22 [bug#29932] [PATCH 0/2] Clean up operating-system-kernel-arguments Danny Milosavljevic
2018-01-01 13:27 ` Danny Milosavljevic [this message]
2018-01-01 13:27 ` [bug#29932] [PATCH 2/2] system: Rename operating-system-user-kernel-arguments to operating-system-kernel-arguments Danny Milosavljevic
2018-01-08 9:26 ` [bug#29932] [PATCH 0/2] Clean up operating-system-kernel-arguments Ludovic Courtès
2018-01-09 8:21 ` Danny Milosavljevic
2018-01-09 8:52 ` Ludovic Courtès
2018-01-09 10:34 ` Danny Milosavljevic
2018-01-09 11:53 ` Ludovic Courtès
2018-01-09 10:39 ` Danny Milosavljevic
2018-01-09 18:59 ` Danny Milosavljevic
2018-01-11 16:43 ` Ludovic Courtès
2018-01-12 10:59 ` [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 11:01 ` [bug#29932] [PATCH v2 2/2] system: Rename operating-system-user-kernel-arguments to operating-system-kernel-arguments Danny Milosavljevic
2018-01-12 14:06 ` Ludovic Courtès
2018-01-12 14:43 ` Danny Milosavljevic
2020-10-08 17:50 ` Maxim Cournoyer
2021-07-13 11:56 ` bug#29932: [PATCH 0/2] Clean up operating-system-kernel-arguments Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180101132703.26309-1-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=29932@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.