From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eW08L-0002xb-Tg 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 1eW08I-0000fD-QW for guix-patches@gnu.org; Mon, 01 Jan 2018 08:28:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:50646) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eW08I-0000ez-Lo 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-0007BS-8B for guix-patches@gnu.org; Mon, 01 Jan 2018 08:28:02 -0500 Subject: [bug#29932] [PATCH 1/2] system: Inline operating-system-kernel-arguments. Resent-Message-ID: From: Danny Milosavljevic Date: Mon, 1 Jan 2018 14:27:02 +0100 Message-Id: <20180101132703.26309-1-dannym@scratchpost.org> In-Reply-To: <20180101132200.26157-1-dannym@scratchpost.org> References: <20180101132200.26157-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-kernel-arguments): Remove. (bootable-kernel-arguments): Export. (read-boot-parameters-file): Use bootable-kernel-arguments. * gnu/system/vm.scm (system-qemu-image/shared-store-script): Use bootable-kernel-arguments. --- gnu/system.scm | 15 ++++++--------- gnu/system/vm.scm | 4 +++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index df89ca06d..42e0c37c1 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -117,7 +117,9 @@ local-host-aliases %setuid-programs %base-packages - %base-firmware)) + %base-firmware + + bootable-kernel-arguments)) ;;; Commentary: ;;; @@ -200,13 +202,6 @@ booted from ROOT-DEVICE" (sudoers-file operating-system-sudoers-file ; file-like (default %sudoers-specification))) -(define (operating-system-kernel-arguments os system.drv root-device) - "Return all the kernel arguments, including the ones not specified -directly by the user." - (bootable-kernel-arguments (operating-system-user-kernel-arguments os) - system.drv - root-device)) - ;;; ;;; Boot parameters @@ -940,7 +935,9 @@ kernel arguments for that derivation to ." (kernel (operating-system-kernel-file os)) (kernel-arguments (if system.drv - (operating-system-kernel-arguments os system.drv root-device) + (bootable-kernel-arguments + (operating-system-user-kernel-arguments os) + system.drv root-device) (operating-system-user-kernel-arguments os))) (initrd initrd) (bootloader-name bootloader-name) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 53629daa9..323eceac5 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -704,7 +704,9 @@ it is mostly useful when FULL-BOOT? is true." #:disk-image-size disk-image-size))) (define kernel-arguments #~(list #$@(if graphic? #~() #~("console=ttyS0")) - #+@(operating-system-kernel-arguments os os-drv "/dev/vda1"))) + #+@(bootable-kernel-arguments + (operating-system-user-kernel-arguments os) + os-drv "/dev/vda1"))) (define qemu-exec #~(list (string-append #$qemu "/bin/" #$(qemu-command (%current-system)))