From: Danny Milosavljevic <dannym@scratchpost.org>
To: 29932@debbugs.gnu.org
Subject: [bug#29932] [PATCH v2 2/2] system: Rename operating-system-user-kernel-arguments to operating-system-kernel-arguments.
Date: Fri, 12 Jan 2018 12:01:47 +0100 [thread overview]
Message-ID: <20180112110147.7305-1-dannym@scratchpost.org> (raw)
In-Reply-To: <20180112105953.7198-1-dannym@scratchpost.org>
* gnu/system.scm (operating-system-user-kernel-arguments): Rename to...
(operating-system-kernel-arguments): ... this.
<operating-system>: Adapt to new name.
(operating-system-boot-parameters): Adapt to new name.
* gnu/system/vm.scm (system-qemu-image/shared-store-script): Adapt to new name.
* gnu/tests.scm (marionette-operating-system): Adapt to new name.
---
gnu/system.scm | 6 +++---
gnu/system/vm.scm | 2 +-
gnu/tests.scm | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index 51f45f6ac..92b3e2959 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -74,7 +74,7 @@
operating-system-kernel
operating-system-kernel-file
operating-system-boot-kernel-arguments
- operating-system-user-kernel-arguments
+ operating-system-kernel-arguments
operating-system-initrd
operating-system-users
operating-system-groups
@@ -146,7 +146,7 @@
operating-system?
(kernel operating-system-kernel ; package
(default linux-libre))
- (kernel-arguments operating-system-user-kernel-arguments
+ (kernel-arguments operating-system-kernel-arguments
(default '())) ; list of gexps/strings
(bootloader operating-system-bootloader) ; <bootloader-configuration>
@@ -939,7 +939,7 @@ kernel arguments for that derivation to <boot-parameters>."
(append (if system.drv
(operating-system-boot-kernel-arguments os)
'())
- (operating-system-user-kernel-arguments os)))
+ (operating-system-kernel-arguments os)))
(initrd initrd)
(bootloader-name bootloader-name)
(store-device (ensure-not-/dev (fs->boot-device store)))
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 6ba76142b..ec2f5b2f7 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -717,7 +717,7 @@ it is mostly useful when FULL-BOOT? is true."
(define kernel-arguments
#~(list #$@(if graphic? #~() #~("console=ttyS0"))
#+@(append (operating-system-boot-kernel-arguments os)
- (operating-system-user-kernel-arguments os))))
+ (operating-system-kernel-arguments os))))
(define qemu-exec
#~(list (string-append #$qemu "/bin/" #$(qemu-command (%current-system)))
diff --git a/gnu/tests.scm b/gnu/tests.scm
index 3e4c3d4e3..a4f70a5a4 100644
--- a/gnu/tests.scm
+++ b/gnu/tests.scm
@@ -174,7 +174,7 @@ in REQUIREMENTS."
(inherit os)
;; Make sure the guest dies on error.
(kernel-arguments (cons "panic=1"
- (operating-system-user-kernel-arguments os)))
+ (operating-system-kernel-arguments os)))
;; Make sure the guest doesn't hang in the REPL on error.
(initrd (lambda (fs . rest)
(apply (operating-system-initrd os) fs
next prev parent reply other threads:[~2018-01-12 11:02 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 ` [bug#29932] [PATCH 1/2] system: Inline operating-system-kernel-arguments Danny Milosavljevic
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 ` Danny Milosavljevic [this message]
2018-01-12 14:06 ` [bug#29932] [PATCH v2 2/2] system: Rename operating-system-user-kernel-arguments to operating-system-kernel-arguments 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=20180112110147.7305-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.