nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Danny Milosavljevic 2017-04-21 04:21:20 +02:00
parent 10b91ccaaa
commit af98d25a12
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/system.scm
View File

@ -73,7 +73,7 @@
operating-system-hosts-file operating-system-hosts-file
operating-system-kernel operating-system-kernel
operating-system-kernel-file operating-system-kernel-file
operating-system-kernel-arguments operating-system-user-kernel-arguments
operating-system-initrd operating-system-initrd
operating-system-users operating-system-users
operating-system-groups operating-system-groups
@ -129,7 +129,7 @@
operating-system? operating-system?
(kernel operating-system-kernel ; package (kernel operating-system-kernel ; package
(default linux-libre)) (default linux-libre))
(kernel-arguments operating-system-kernel-arguments (kernel-arguments operating-system-user-kernel-arguments
(default '())) ; list of gexps/strings (default '())) ; list of gexps/strings
(bootloader operating-system-bootloader) ; <grub-configuration> (bootloader operating-system-bootloader) ; <grub-configuration>
@ -756,7 +756,7 @@ populate the \"old entries\" menu."
#~(string-append "--system=" #$system) #~(string-append "--system=" #$system)
#~(string-append "--load=" #$system #~(string-append "--load=" #$system
"/boot") "/boot")
(operating-system-kernel-arguments os))) (operating-system-user-kernel-arguments os)))
(initrd initrd))))) (initrd initrd)))))
(grub-configuration-file (operating-system-bootloader os) entries (grub-configuration-file (operating-system-bootloader os) entries
#:old-entries old-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)) (root-device #$(file-system-device root))
(kernel #$(operating-system-kernel-file os)) (kernel #$(operating-system-kernel-file os))
(kernel-arguments (kernel-arguments
#$(operating-system-kernel-arguments os)) #$(operating-system-user-kernel-arguments os))
(initrd #$initrd) (initrd #$initrd)
(store (store
(device #$(fs->boot-device store)) (device #$(fs->boot-device store))

2
gnu/system/vm.scm
View File

@ -494,7 +494,7 @@ it is mostly useful when FULL-BOOT? is true."
(string-append "--system=" #$os-drv) (string-append "--system=" #$os-drv)
(string-append "--load=" #$os-drv "/boot") (string-append "--load=" #$os-drv "/boot")
#$@(if graphic? #~() #~("console=ttyS0")) #$@(if graphic? #~() #~("console=ttyS0"))
#+@(operating-system-kernel-arguments os))) #+@(operating-system-user-kernel-arguments os)))
(define qemu-exec (define qemu-exec
#~(list (string-append #$qemu "/bin/" #$(qemu-command (%current-system))) #~(list (string-append #$qemu "/bin/" #$(qemu-command (%current-system)))