From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZx68-0002Ch-5C for guix-patches@gnu.org; Fri, 12 Jan 2018 06:02:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZx62-00039t-9p for guix-patches@gnu.org; Fri, 12 Jan 2018 06:02:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:45031) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eZx62-00039g-6u for guix-patches@gnu.org; Fri, 12 Jan 2018 06:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eZx61-0008IQ-Vj for guix-patches@gnu.org; Fri, 12 Jan 2018 06:02:02 -0500 Subject: [bug#29932] [PATCH v2 2/2] system: Rename operating-system-user-kernel-arguments to operating-system-kernel-arguments. Resent-Message-ID: From: Danny Milosavljevic Date: Fri, 12 Jan 2018 12:01:47 +0100 Message-Id: <20180112110147.7305-1-dannym@scratchpost.org> In-Reply-To: <20180112105953.7198-1-dannym@scratchpost.org> References: <20180112105953.7198-1-dannym@scratchpost.org> 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: 29932@debbugs.gnu.org * gnu/system.scm (operating-system-user-kernel-arguments): Rename to... (operating-system-kernel-arguments): ... this. : 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) ; @@ -939,7 +939,7 @@ kernel arguments for that derivation to ." (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