From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 70E2B139085 for ; Sat, 7 Jan 2017 23:37:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B42E4E0C41; Sat, 7 Jan 2017 23:37:40 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9141EE0C41 for ; Sat, 7 Jan 2017 23:37:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED109341265 for ; Sat, 7 Jan 2017 23:37:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2263024EC for ; Sat, 7 Jan 2017 23:37:37 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1483832237.629ea57860b7332a4922fc77b07a9118551eec0f.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.defaults X-VCS-Directories: defaults/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 629ea57860b7332a4922fc77b07a9118551eec0f X-VCS-Branch: master Date: Sat, 7 Jan 2017 23:37:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0548938b-3e87-402e-9b2d-91f84388b6d4 X-Archives-Hash: 9b0ac9d4f485e989dd2a751f7db2421d commit: 629ea57860b7332a4922fc77b07a9118551eec0f Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jan 7 23:15:05 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jan 7 23:37:17 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=629ea578 Improve documentation for HWOPTS/MY_HWOPTS. Signed-off-by: Robin H. Johnson gentoo.org> defaults/initrd.defaults | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults index 43f5c09..b7128eb 100755 --- a/defaults/initrd.defaults +++ b/defaults/initrd.defaults @@ -79,10 +79,17 @@ LOOPS='/livecd.loop /zisofs /livecd.squashfs /image.squashfs /livecd.gcloop' DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024" -# This should list all possible hwopts that take do/no prefixes -# this is part of the load order too fyi -HWOPTS='keymap cache modules nvme pata sata scsi usb firewire waitscan lvm dmraid multipath mdadm zfs fs net' +# HWOPTS is the list of ALL options that take do/no prefixes, almost all of +# which match a MODULES_* variable; it is ALSO the order of evaluation. +# +# The following entries are special behavior, rather than module loading +# - keymap +# - cache +# - modules +HWOPTS_BLK='nvme pata sata scsi usb firewire waitscan' +HWOPTS_OBSOLETE='pcmcia ataraid' # Obsolete stuff that might be useful on old hardware, do$X only. +HWOPTS="keymap cache modules ${HWOPTS_BLK} lvm dmraid multipath mdadm zfs fs net iscsi crypto" -# Only sections that are in by default or those that -# are not module groups need to be defined here... -MY_HWOPTS='modules pata nvme sata scsi usb firewire waitscan dmraid mdadm fs net iscsi crypto' +# This is the set of default HWOPTS, in the order that they are loaded. +# This is whitespace aligned with HWOPTS above. +MY_HWOPTS=" modules ${HWOPT_BLK} dmraid mdadm fs net crypto"