From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1099784-garchives=archives.gentoo.org@lists.gentoo.org>
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 C0D69138334
for <garchives@archives.gentoo.org>; Mon, 15 Jul 2019 22:39:36 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C7A11E0829;
Mon, 15 Jul 2019 22:39:35 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A9E3FE0829
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Jul 2019 22:39:35 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 567A2347C54
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Jul 2019 22:39:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 54D8D6F2
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Jul 2019 22:39:32 +0000 (UTC)
From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" <whissi@gentoo.org>
Message-ID: <1563220274.7582b5cde9e0118bc5784d45ab49db8ae7c8a8d2.whissi@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: whissi
X-VCS-Committer-Name: Thomas Deutschmann
X-VCS-Revision: 7582b5cde9e0118bc5784d45ab49db8ae7c8a8d2
X-VCS-Branch: master
Date: Mon, 15 Jul 2019 22:39:32 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a8394fe8-0641-40f1-94ee-663fed1eb486
X-Archives-Hash: 53181b1ad77226943c82c2093cdbd00c
commit: 7582b5cde9e0118bc5784d45ab49db8ae7c8a8d2
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 19:51:14 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 19:51:14 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7582b5cd
linuxrc: No need to call 'busybox findfs'
Normal findfs is already 'busybox findfs'.
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
defaults/initrd.scripts | 6 ------
defaults/linuxrc | 8 +-------
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index ff832a4..c4a037b 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -777,12 +777,6 @@ find_real_device() {
retval=$?
fi
- if [ ${retval} -ne 0 ]
- then
- REAL_DEVICE=$(busybox findfs "${DEVICE}" 2>/dev/null)
- retval=$?
- fi
-
if [ ${retval} -ne 0 ]
then
REAL_DEVICE=$(blkid -o device -l -t "${DEVICE}" 2>/dev/null)
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 83b7572..63e2360 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -614,12 +614,6 @@ do
retval=$?
fi
- if [ ${retval} -ne 0 ]
- then
- ROOT_DEV=$(busybox findfs "${REAL_ROOT}" 2>/dev/null)
- retval=$?
- fi
-
if [ ${retval} -ne 0 ]
then
ROOT_DEV=$(blkid -o device -l -t "${REAL_ROOT}" 2>/dev/null)
@@ -694,7 +688,7 @@ do
if [ "${got_good_root}" != '1' ]
then
let ROOTDELAY_100MSEC=${ROOTDELAY_100MSEC}-1
- usleep 100
+ sleep 0.1s
fi
done # End of sleep loop waiting on root