[bug#29932] [PATCH v2 2/2] system: Rename operating-system-user-kernel-arguments to operating-system-kernel-arguments.

[Danny Milosavljevic]

* 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