From patchwork Sat Apr 4 17:46:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 21092 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 77A2627BBE4; Sat, 4 Apr 2020 18:47:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3C64D27BBE1 for ; Sat, 4 Apr 2020 18:47:11 +0100 (BST) Received: from localhost ([::1]:40956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKmsw-0002MS-Mc for patchwork@mira.cbaines.net; Sat, 04 Apr 2020 13:47:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35754) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKmsp-0002MC-GR for guix-patches@gnu.org; Sat, 04 Apr 2020 13:47:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKmso-0008Bn-CD for guix-patches@gnu.org; Sat, 04 Apr 2020 13:47:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33184) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jKmso-0008Ba-9c for guix-patches@gnu.org; Sat, 04 Apr 2020 13:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jKmso-00061a-70 for guix-patches@gnu.org; Sat, 04 Apr 2020 13:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40274] [PATCH v6 2/2] gnu: Add kernel-module-loader-service. Resent-From: "pelzflorian (Florian Pelz)" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Apr 2020 17:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40274 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brice Waegeneire Cc: 40274@debbugs.gnu.org, Guix-patches Received: via spool by 40274-submit@debbugs.gnu.org id=B40274.158602239923090 (code B ref 40274); Sat, 04 Apr 2020 17:47:02 +0000 Received: (at 40274) by debbugs.gnu.org; 4 Apr 2020 17:46:39 +0000 Received: from localhost ([127.0.0.1]:44730 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKmsR-00060L-Ee for submit@debbugs.gnu.org; Sat, 04 Apr 2020 13:46:39 -0400 Received: from pelzflorian.de ([5.45.111.108]:49700 helo=mail.pelzflorian.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKmsP-000609-HI for 40274@debbugs.gnu.org; Sat, 04 Apr 2020 13:46:38 -0400 Received: from pelzflorian.localdomain (unknown [5.45.111.108]) by mail.pelzflorian.de (Postfix) with ESMTPSA id 1A80036055C; Sat, 4 Apr 2020 19:46:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=pelzflorian.de; s=mail; t=1586022396; bh=o9LwRG9H0OztpcDp8YBUPsy2hhD7raqVKGKVCLwx4YA=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=UR5xMAPY7ZAREUi8N0rV3R7kmQmgu89X4x81cJsSlRtfYFR6K7f2pd3TI5ICBZRiU Zi7k5lj5Ofmj4NMRrKwYIbszC8UG6T81m2X9SCAXA8YsZszy9+NX2DITmGoSvzILM3 vEwAH0iy4XVGoSNgkBtK3mYQOBkxow2qCDCWo9ao= Date: Sat, 4 Apr 2020 19:46:34 +0200 From: "pelzflorian (Florian Pelz)" Message-ID: <20200404174634.2iswkauau7wmzzsu@pelzflorian.localdomain> References: <20200328135908.2540-1-brice@waegenei.re> <20200404151732.20341-1-brice@waegenei.re> <20200404151732.20341-3-brice@waegenei.re> <20200404160954.js2zya4un7ohngy7@pelzflorian.localdomain> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches On Sat, Apr 04, 2020 at 04:49:16PM +0000, Brice Waegeneire wrote: > Please do send feedback on using it, especially since you are the only one > in need of specifying module parameters ATM. I kept your usage in mind when > writing this patch version. > > - Brice It does not seem to work. There is nothing in /var/log/messages but when I do root@gnu.org # herd start kernel-module-loader herd: exception caught while executing 'start' on service 'kernel-module-loader': In procedure module-lookup: Unbound variable: get-line I attach my changes. Regards, Florian diff --git a/gnu/system/install.scm b/gnu/system/install.scm index c15c2c7814..1348c63f25 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -26,11 +26,13 @@ #:use-module (gnu bootloader u-boot) #:use-module (guix gexp) #:use-module (guix store) + #:use-module (guix utils) #:use-module (guix monads) #:use-module ((guix packages) #:select (package-version)) #:use-module ((guix store) #:select (%store-prefix)) #:use-module (gnu installer) #:use-module (gnu services dbus) + #:use-module (gnu services linux) #:use-module (gnu services networking) #:use-module (gnu services shepherd) #:use-module (gnu services ssh) @@ -50,6 +52,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages compression) #:use-module (gnu packages nvi) + #:use-module (gnu packages xorg) #:use-module (ice-9 match) #:use-module (srfi srfi-26) #:export (installation-os @@ -304,7 +307,8 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m (define bare-bones-os (load "examples/bare-bones.tmpl")) - (list (service virtual-terminal-service-type) + (cons* + (service virtual-terminal-service-type) (service kmscon-service-type (kmscon-configuration @@ -408,7 +412,23 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m (list bare-bones-os glibc-utf8-locales texinfo - (canonical-package guile-2.2)))))) + (canonical-package guile-2.2))) + (if (member (%current-system) '("x86_64-linux" "i686-linux")) + ;; Load uvesafb to show installer when no KMS is available. + `(,(service kernel-module-loader-service-type '("uvesafb")) + ,(let ((uvesafb-options + #~(with-output-to-file #$output + (lambda _ + (format #t + (string-join `("options" "uvesafb" + ,(string-append "v86d=" #$v86d + "/sbin/v86d") + "mode_option=1024x768"))))))) + (simple-service 'uvesafb-configuration etc-service-type + (list `("modprobe.d/uvesafb.conf" + ,(computed-file "uvesafb-options" + uvesafb-options)))))) + '())))) (define %issue ;; Greeting.