From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RuJnm-00045S-3q for garchives@archives.gentoo.org; Mon, 06 Feb 2012 08:19:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 383E2E060C; Mon, 6 Feb 2012 08:19:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0633EE05FE for ; Mon, 6 Feb 2012 08:19:35 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F79E1B4048 for ; Mon, 6 Feb 2012 08:19:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7435080043 for ; Mon, 6 Feb 2012 08:19:34 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: Subject: [gentoo-commits] proj/genkernel:master commit in: /, defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog defaults/initrd.scripts X-VCS-Directories: / defaults/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: af26e433cbe7b94ee699b4ecd14fe89efa46ecfe Date: Mon, 6 Feb 2012 08:19:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e421e3b2-b940-4939-9c1d-9520f0f7cc69 X-Archives-Hash: f74cf3f51f008d8e6c742e6e4fd31aa9 commit: af26e433cbe7b94ee699b4ecd14fe89efa46ecfe Author: Robin H. Johnson gentoo org> AuthorDate: Mon Feb 6 07:50:17 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Feb 6 08:19:05 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3Daf26e433 Support virtio devices, and provide fallback of all remaining devices. Signed-off-by: Robin H. Johnson gentoo.org> --- ChangeLog | 3 +++ defaults/initrd.scripts | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c39b7b..bc8be73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ # Distributed under the GPL v2 # $Id$ =20 + 06 Feb 2012; Robin H. Johnson defaults/initrd.scr= ipts: + Support virtio devices, and provide fallback of all remaining devices. + 03 Feb 2012; Sebastian Pipping defaults/initrd.scri= pts: Support SD card readers. Patch by Rick Farina =20 diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 4f71a88..609c52f 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -139,12 +139,17 @@ devicelist(){ DEVICES=3D"$DEVICES /dev/sd*" # IDE devices DEVICES=3D"$DEVICES /dev/hd*" + # virtio devices + DEVICES=3D"$DEVICES /dev/vd*" # USB using the USB Block Driver DEVICES=3D"$DEVICES /dev/ubd* /dev/ubd/*" # iSeries devices DEVICES=3D"$DEVICES /dev/iseries/vcd*" # builtin mmc/sd card reader devices DEVICES=3D"$DEVICES /dev/mmcblk* /dev/mmcblk*/*" + # fallback scanning, this might scan something twice, but it's better t= han + # failing to boot. + [ -e /proc/partitions ] && DEVICES=3D"${DEVICES} $(awk -r '/([0-9]+[[:s= pace:]]+)/{print "/dev/" $4}' /proc/partitions)" echo ${DEVICES} } =20