From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1TqN-0007ot-Pc for guix-patches@gnu.org; Fri, 21 Apr 2017 04:23:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1TqI-0007VU-Qn for guix-patches@gnu.org; Fri, 21 Apr 2017 04:23:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:33266) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d1TqI-0007VE-Nj for guix-patches@gnu.org; Fri, 21 Apr 2017 04:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d1TqI-0000Sj-I8 for guix-patches@gnu.org; Fri, 21 Apr 2017 04:23:02 -0400 Subject: bug#26544: [PATCH v2 1/8] system: Rename operating-system-kernel-arguments to operating-system-user-kernel-arguments. Resent-Message-ID: References: <20170421022127.20524-1-dannym@scratchpost.org> <20170421022127.20524-2-dannym@scratchpost.org> From: Mathieu Othacehe In-reply-to: <20170421022127.20524-2-dannym@scratchpost.org> Date: Fri, 21 Apr 2017 10:23:08 +0200 Message-ID: <86fuh2kw43.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Danny Milosavljevic Cc: 26544@debbugs.gnu.org LGTM! Danny Milosavljevic writes: > * gnu/system.scm (operating-system-kernel-arguments): Rename to ... > (operating-system-user-kernel-arguments): ... this. > (): 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) ; > > @@ -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)))