guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#29932] [PATCH 2/2] system: Rename operating-system-user-kernel-argu


From: Danny Milosavljevic
Subject: [bug#29932] [PATCH 2/2] system: Rename operating-system-user-kernel-arguments to operating-system-kernel-arguments.
Date: Mon, 1 Jan 2018 14:27:03 +0100

* gnu/system.scm (operating-system-user-kernel-arguments): Rename to ...
(operating-system-kernel-arguments): ... this.
* gnu/system/vm.scm (system-qemu-image/shared-store-script): Use
operating-system-kernel-arguments.
---
 gnu/system.scm    | 6 +++---
 gnu/system/vm.scm | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 42e0c37c1..79e3facee 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -149,7 +149,7 @@ booted from ROOT-DEVICE"
   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>
 
@@ -936,9 +936,9 @@ kernel arguments for that derivation to <boot-parameters>."
              (kernel-arguments
               (if system.drv
                 (bootable-kernel-arguments
-                 (operating-system-user-kernel-arguments os)
+                 (operating-system-kernel-arguments os)
                  system.drv root-device)
-                (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 323eceac5..13c1557df 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -705,7 +705,7 @@ it is mostly useful when FULL-BOOT?  is true."
     (define kernel-arguments
       #~(list #$@(if graphic? #~() #~("console=ttyS0"))
               #+@(bootable-kernel-arguments
-                  (operating-system-user-kernel-arguments os)
+                  (operating-system-kernel-arguments os)
                   os-drv "/dev/vda1")))
 
     (define qemu-exec





reply via email to

[Prev in Thread] Current Thread [Next in Thread]