From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eW08L-0002xa-TV for guix-patches@gnu.org; Mon, 01 Jan 2018 08:28:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eW08J-0000fP-0f for guix-patches@gnu.org; Mon, 01 Jan 2018 08:28:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:50647) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eW08I-0000fH-Tb for guix-patches@gnu.org; Mon, 01 Jan 2018 08:28:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eW08I-0007Ba-Mc for guix-patches@gnu.org; Mon, 01 Jan 2018 08:28:02 -0500 Subject: [bug#29932] [PATCH 2/2] system: Rename operating-system-user-kernel-arguments to operating-system-kernel-arguments. Resent-Message-ID: From: Danny Milosavljevic Date: Mon, 1 Jan 2018 14:27:03 +0100 Message-Id: <20180101132703.26309-2-dannym@scratchpost.org> In-Reply-To: <20180101132703.26309-1-dannym@scratchpost.org> References: <20180101132200.26157-1-dannym@scratchpost.org> <20180101132703.26309-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. * gnu/system/vm.scm (system-qemu-image/shared-store-script): Use operating-system-kernel-arguments. --- gnu/system.scm | 6 +++--- gnu/system/vm.scm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 42e0c37c1..79e3facee 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -149,7 +149,7 @@ booted from ROOT-DEVICE" 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) ; @@ -936,9 +936,9 @@ kernel arguments for that derivation to ." (kernel-arguments (if system.drv (bootable-kernel-arguments - (operating-system-user-kernel-arguments os) + (operating-system-kernel-arguments os) system.drv root-device) - (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 323eceac5..13c1557df 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -705,7 +705,7 @@ it is mostly useful when FULL-BOOT? is true." (define kernel-arguments #~(list #$@(if graphic? #~() #~("console=ttyS0")) #+@(bootable-kernel-arguments - (operating-system-user-kernel-arguments os) + (operating-system-kernel-arguments os) os-drv "/dev/vda1"))) (define qemu-exec