aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2017-04-21 04:21:20 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2017-04-22 20:54:31 +0200
commitaf98d25a1286e246e8da36d6d63b4d66e58f2cf8 (patch)
treeaadfeef4601d7c132d9e0af8eda04e31093537b2
parent10b91ccaaad9e81f8bcb0b0ecb0b9461362f2d77 (diff)
downloadguix-af98d25a1286e246e8da36d6d63b4d66e58f2cf8.tar
guix-af98d25a1286e246e8da36d6d63b4d66e58f2cf8.tar.gz
system: Rename operating-system-kernel-arguments to operating-system-user-kernel-arguments.
* gnu/system.scm (operating-system-kernel-arguments): Rename to ... (operating-system-user-kernel-arguments): ... this. (<operating-system>): Adapt accordingly. (operating-system-bootcfg): Adapt accordingly. (operating-system-parameters-file): Adapt accordingly. * gnu/system/vm.scm (system-qemu-image/shared-store-script): Adapt accordingly.
-rw-r--r--gnu/system.scm8
-rw-r--r--gnu/system/vm.scm2
2 files changed, 5 insertions, 5 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index f6ab7ded85..4032e8e150 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -73,7 +73,7 @@
operating-system-hosts-file
operating-system-kernel
operating-system-kernel-file
- operating-system-kernel-arguments
+ operating-system-user-kernel-arguments
operating-system-initrd
operating-system-users
operating-system-groups
@@ -129,7 +129,7 @@
operating-system?
(kernel operating-system-kernel ; package
(default linux-libre))
- (kernel-arguments operating-system-kernel-arguments
+ (kernel-arguments operating-system-user-kernel-arguments
(default '())) ; list of gexps/strings
(bootloader operating-system-bootloader) ; <grub-configuration>
@@ -756,7 +756,7 @@ populate the \"old entries\" menu."
#~(string-append "--system=" #$system)
#~(string-append "--load=" #$system
"/boot")
- (operating-system-kernel-arguments os)))
+ (operating-system-user-kernel-arguments os)))
(initrd initrd)))))
(grub-configuration-file (operating-system-bootloader os) entries
#:old-entries old-entries)))
@@ -784,7 +784,7 @@ this file is the reconstruction of GRUB menu entries for old configurations."
(root-device #$(file-system-device root))
(kernel #$(operating-system-kernel-file os))
(kernel-arguments
- #$(operating-system-kernel-arguments os))
+ #$(operating-system-user-kernel-arguments os))
(initrd #$initrd)
(store
(device #$(fs->boot-device store))
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 374d8b6636..4f915c4f95 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -494,7 +494,7 @@ it is mostly useful when FULL-BOOT? is true."
(string-append "--system=" #$os-drv)
(string-append "--load=" #$os-drv "/boot")
#$@(if graphic? #~() #~("console=ttyS0"))
- #+@(operating-system-kernel-arguments os)))
+ #+@(operating-system-user-kernel-arguments os)))
(define qemu-exec
#~(list (string-append #$qemu "/bin/" #$(qemu-command (%current-system)))