guix-patches
[Top][All Lists]
Advanced

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

bug#26544: [PATCH v2 1/8] system: Rename operating-system-kernel-argumen


From: Mathieu Othacehe
Subject: bug#26544: [PATCH v2 1/8] system: Rename operating-system-kernel-arguments to operating-system-user-kernel-arguments.
Date: Fri, 21 Apr 2017 10:23:08 +0200
User-agent: mu4e 0.9.18; emacs 25.2.1

LGTM!

Danny Milosavljevic writes:

> * 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.
> ---
>  gnu/system.scm    | 8 ++++----
>  gnu/system/vm.scm | 2 +-
>  2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/system.scm b/gnu/system.scm
> index f6ab7ded8..4032e8e15 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 374d8b663..4f915c4f9 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)))






reply via email to

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