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 1SIBXk-0007im-8H for garchives@archives.gentoo.org; Thu, 12 Apr 2012 04:22:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 745A6E0C75; Thu, 12 Apr 2012 04:21:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 411ECE0C6D for ; Thu, 12 Apr 2012 04:21:33 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D8C31B4009 for ; Thu, 12 Apr 2012 04:21:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1E348E542E for ; Thu, 12 Apr 2012 04:21:30 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1334203724.69009cb7475cd4067791f96747a09a26abf4742b.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts defaults/linuxrc X-VCS-Directories: defaults/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 69009cb7475cd4067791f96747a09a26abf4742b X-VCS-Branch: master Date: Thu, 12 Apr 2012 04:21:30 +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: f76f196c-dfe1-4c30-ac9f-d32d79578925 X-Archives-Hash: dab265b6a4289a81ede0af461b455a40 commit: 69009cb7475cd4067791f96747a09a26abf4742b Author: Richard Yao cs stonybrook edu> AuthorDate: Thu Mar 15 21:45:04 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Thu Apr 12 04:08:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D69009cb7 Reorder mdev initialization to mimic udev boot --- defaults/initrd.scripts | 13 +------------ defaults/linuxrc | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 8aad72b..5d523ab 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -298,7 +298,7 @@ run_shell() { /bin/ash } =20 -runmdev() { +mount_devfs () { # Use devtmpfs if enabled in kernel, # else tmpfs. Always run mdev just in case devfs=3Dtmpfs @@ -313,7 +313,6 @@ runmdev() { # http://git.busybox.net/busybox/plain/docs/mdev.txt mkdir -m 0755 /dev/pts mount -t devpts -o gid=3D5,mode=3D0620 devpts /dev/pts || bad_msg "Fai= led to mount /dev/pts" - mdev -s || bad_msg "Failed to receive dynamic updates from mdev" } =20 test_success() { @@ -433,16 +432,6 @@ setup_slowusb() { done } =20 -start_dev_mgr() { - if [ "${KV_2_6_OR_GREATER}" ] - then - cd /sys - good_msg 'Activating mdev' - runmdev - cd / - fi -} - cmdline_hwopts() { # Scan CMDLINE for any "doscsi" or "noscsi"-type arguments local FOUND diff --git a/defaults/linuxrc b/defaults/linuxrc index 3f13f77..7f68836 100755 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -271,12 +271,24 @@ splash 'init' =20 cmdline_hwopts =20 +# Mount devfs +mount_devfs + # Mount sysfs mount_sysfs =20 # Setup hotplugging for firmware loading setup_hotplug =20 +# Start mdev +if [ "${KV_2_6_OR_GREATER}" ] +then + cd /sys + good_msg 'Activating mdev' + mdev -s || bad_msg "Failed to receive dynamic updates from mdev" + cd / +fi + # Load modules listed in MY_HWOPTS if /lib/modules exists for the runnin= g kernel if [ -z "${DO_modules}" ] then @@ -304,9 +316,6 @@ sdelay # Setup slow USB bits setup_slowusb =20 -# Start device manager -start_dev_mgr - # if doslowusb is passed, pause other 10 seconds here, after mdev load [ "${DO_slowusb}" ] && sleep 10 =20