From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2Ld9LhigqV7wZAAA0tVLHw (envelope-from ) for ; Wed, 29 Apr 2020 15:41:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id IJOACCGgqV7JagAA1q6Kng (envelope-from ) for ; Wed, 29 Apr 2020 15:41:21 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 202EF9409EE for ; Wed, 29 Apr 2020 15:41:20 +0000 (UTC) Received: from localhost ([::1]:59334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTopq-0001BO-TO for larch@yhetil.org; Wed, 29 Apr 2020 11:41:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33018) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTom3-0002hr-5u for bug-guix@gnu.org; Wed, 29 Apr 2020 11:37:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTod0-0003ot-OR for bug-guix@gnu.org; Wed, 29 Apr 2020 11:30:38 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60995) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTod0-0003oo-Aa for bug-guix@gnu.org; Wed, 29 Apr 2020 11:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTod0-0000uQ-6c for bug-guix@gnu.org; Wed, 29 Apr 2020 11:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#35574: bcm5974 touchpad is not recognized as touchpad Resent-From: "pelzflorian (Florian Pelz)" Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 29 Apr 2020 15:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35574 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Brice Waegeneire Received: via spool by 35574-submit@debbugs.gnu.org id=B35574.15881740623469 (code B ref 35574); Wed, 29 Apr 2020 15:28:02 +0000 Received: (at 35574) by debbugs.gnu.org; 29 Apr 2020 15:27:42 +0000 Received: from localhost ([127.0.0.1]:44308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTocg-0000tt-DG for submit@debbugs.gnu.org; Wed, 29 Apr 2020 11:27:42 -0400 Received: from pelzflorian.de ([5.45.111.108]:55968 helo=mail.pelzflorian.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTocd-0000tj-VN for 35574@debbugs.gnu.org; Wed, 29 Apr 2020 11:27:40 -0400 Received: from pelzflorian.localdomain (unknown [5.45.111.108]) by mail.pelzflorian.de (Postfix) with ESMTPSA id 44C963605C9; Wed, 29 Apr 2020 17:27:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=pelzflorian.de; s=mail; t=1588174058; bh=9LenqM5TbMnzHSTmMYPivlfsl/iZ/jRtYmPKC08RkWA=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=MBUn7Rt0V4LAWZkNiUbIVCwsm2x88gneWA0Xos1tIKk+OAJMswdNO4yYE1gc/Fv9P BrpSaqS2QCu0rairAMCV70d7/Q9dfD8ISaYJvG+ErvPJaoLOmEZ+U/r9Ljr04DUfvs TmZamG5nB2cLwdel/edbwoMhF6gSdMN1XX/5T9W4= Date: Wed, 29 Apr 2020 17:27:36 +0200 From: "pelzflorian (Florian Pelz)" Message-ID: <20200429152736.xocwatxukviul3bl@pelzflorian.localdomain> References: <20190505065411.2rb5aqaaxywc4qvk@pelzflorian.localdomain> <20190505074152.ttmow2unsscdovhz@pelzflorian.localdomain> <20200116233537.myczkgkwnfpn75hu@pelzflorian.localdomain> <20200420144718.ehopbrz7hzvn5vxx@pelzflorian.localdomain> <20200420155908.ulewy4c2vqkuzgfr@pelzflorian.localdomain> <20200427002857.apq5nreio5kllpoq@pelzflorian.localdomain> <87pnbtwi2y.fsf@gmail.com> <20200428094502.cduna7cyerl77ouq@pelzflorian.localdomain> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nnyzx53rlbpmmkq4" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 35574@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 X-Spam-Score: 0.99 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=pelzflorian.de header.s=mail header.b=MBUn7Rt0; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Scan-Result: default: False [0.99 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.49333510227595]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.17), country: US(-0.00), ip: 2001:470:142::17(-0.49)]; HAS_ATTACHMENT(0.00)[]; R_DKIM_REJECT(1.00)[pelzflorian.de:s=mail]; DWL_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; CTYPE_MIXED_BOGUS(1.00)[]; RCPT_COUNT_TWO(0.00)[2]; DKIM_TRACE(0.00)[pelzflorian.de:-]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_NEQ_ENVFROM(0.00)[pelzflorian@pelzflorian.de,bug-guix-bounces@gnu.org]; ARC_NA(0.00)[]; URIBL_BLOCKED(0.00)[gnu.org:url,scratchpost.org:email,waegenei.re:email,pelzflorian.de:email]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain]; DMARC_NA(0.00)[pelzflorian.de]; HAS_LIST_UNSUB(-0.01)[]; DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; RCVD_COUNT_SEVEN(0.00)[9]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: L/DJqhxiSOF+ --nnyzx53rlbpmmkq4 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit On Tue, Apr 28, 2020 at 02:10:58PM +0000, Brice Waegeneire wrote: > Keeping this module enabled in the kernel seems a good idea, > […] > Passing arguments to the kernel to blacklist a module is the correct way of > doing this currently FWIU; it's already used in gnu/system/install.scm. Thank you. Shall I push the attached patch? Regards, Florian --nnyzx53rlbpmmkq4 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-system-Blacklist-usbmouse-kernel-module-in-default-k.patch" Content-Transfer-Encoding: 8bit >From 67f8a33e669adc24ca2429e500a5137f12497191 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Wed, 29 Apr 2020 17:17:55 +0200 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [PATCH] system: Blacklist usbmouse kernel module in default kernel-arguments. This avoids a race with the bcm5974 kernel module. Fixes . * gnu/system.scm (%default-modprobe-blacklist): New variable. ()[kernel-arguments]: Default to ... (%default-kernel-arguments): ... this new variable. * doc/guix.texi (operating-system Reference): Document the change. --- doc/guix.texi | 2 +- gnu/system.scm | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index d0592220a7..c87283d97f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11274,7 +11274,7 @@ possible to use the GNU@tie{}Hurd.}. A list of objects (usually packages) to collect loadable kernel modules from--e.g. @code{(list ddcci-driver-linux)}. -@item @code{kernel-arguments} (default: @code{'("quiet")}) +@item @code{kernel-arguments} (default: @code{%default-kernel-arguments}) List of strings or gexps representing additional arguments to pass on the command-line of the kernel---e.g., @code{("console=ttyS0")}. diff --git a/gnu/system.scm b/gnu/system.scm index 3c511f4089..ab6982ef5e 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Florian Pelz ;;; ;;; This file is part of GNU Guix. ;;; @@ -148,7 +149,8 @@ %base-packages-linux %base-packages-networking %base-packages-utils - %base-firmware)) + %base-firmware + %default-kernel-arguments)) ;;; Commentary: ;;; @@ -179,7 +181,7 @@ (kernel-loadable-modules operating-system-kernel-loadable-modules (default '())) ; list of packages (kernel-arguments operating-system-user-kernel-arguments - (default '("quiet"))) ; list of gexps/strings + (default %default-kernel-arguments)) ; list of gexps/strings (bootloader operating-system-bootloader) ; (label operating-system-label ; string (thunked) @@ -488,6 +490,16 @@ possible (that is if there's a LINUX keyword argument in the build system)." ((#:linux kernel #f) target-kernel))))) +(define %default-modprobe-blacklist + ;; List of kernel modules to blacklist by default. + '("usbmouse")) ;see + +(define %default-kernel-arguments + ;; Default arguments passed to the kernel. + (list (string-append "modprobe.blacklist=" + (string-join %default-modprobe-blacklist ",")) + "quiet")) + (define* (operating-system-directory-base-entries os) "Return the basic entries of the 'system' directory of OS for use as the value of the SYSTEM-SERVICE-TYPE service." -- 2.26.1 --nnyzx53rlbpmmkq4--